From 227bcdead786d487942a73f2fffd307a39f0a845 Mon Sep 17 00:00:00 2001 From: Cassandra Watergate <55339220+saltedcoffii@users.noreply.github.com> Date: Sat, 19 Mar 2022 07:05:00 -0700 Subject: [PATCH] libgit2 => 1.4.2, rust => 1.59.0, exa => 0.10.1 (#6876) * libgit2 => 1.4.2 * exa => 0.10.1 * rust => 1.59.0 * comment out libgit2 tests * exa: completions and manpages * x86_64 and i686 binaries * Add arm binaries Co-authored-by: Ed Reel --- packages/exa.rb | 49 ++++++++++++++++++++++++++++++--------------- packages/libgit2.rb | 43 +++++++++++++++++++++------------------ packages/rust.rb | 18 ++++++++--------- 3 files changed, 65 insertions(+), 45 deletions(-) diff --git a/packages/exa.rb b/packages/exa.rb index c879c52e6..b1f872c34 100644 --- a/packages/exa.rb +++ b/packages/exa.rb @@ -1,37 +1,54 @@ require 'package' class Exa < Package - description 'Modern replacement for \'ls\'' - homepage 'https://the.exa.website' - version '0.9.0' + description "Exa is a modern replacement for ls" + homepage 'https://the.exa.website/' + @_ver = '0.10.1' + version @_ver license 'Apache-2.0, MIT and Unlicense' - compatibility 'aarch64,armv7l,x86_64' - source_url 'https://github.com/ogham/exa/archive/v0.9.0.tar.gz' - source_sha256 '96e743ffac0512a278de9ca3277183536ee8b691a46ff200ec27e28108fef783' + compatibility 'all' + source_url 'https://github.com/ogham/exa.git' + git_hashtag "v#{@_ver}" - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.9.0_armv7l/exa-0.9.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.9.0_armv7l/exa-0.9.0-chromeos-armv7l.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.9.0_x86_64/exa-0.9.0-chromeos-x86_64.tar.xz', + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.10.1_armv7l/exa-0.10.1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.10.1_armv7l/exa-0.10.1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.10.1_i686/exa-0.10.1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/exa/0.10.1_x86_64/exa-0.10.1-chromeos-x86_64.tar.zst' }) - binary_sha256 ({ - aarch64: '42133a358da6081dc28f67ce182ba414e14a1c73da85bdf8e573851b3bb8bf54', - armv7l: '42133a358da6081dc28f67ce182ba414e14a1c73da85bdf8e573851b3bb8bf54', - x86_64: '2d89beb090ae156c7c9192236e99c77c259885534cb200cb32ec2ae1dd2b525e', + binary_sha256({ + aarch64: 'e565a30749d5137ea0d74b55022518d062fdbe61b0ec628acd934a9302139060', + armv7l: 'e565a30749d5137ea0d74b55022518d062fdbe61b0ec628acd934a9302139060', + i686: '588f32e51731a5dd6b6b0009a35ac23b11c2ab54ef52dbb653892fd719d18521', + x86_64: '30085328379c821d79a317d75a8425c25938961335c15be9e3b3a16652f9a873' }) depends_on 'rust' => :build + depends_on 'pandoc' => :build depends_on 'libgit2' def self.build system 'cargo build --release -v' + system 'pandoc --standalone -f markdown -t man man/exa.1.md | tee exa.1 1> /dev/null' + system 'pandoc --standalone -f markdown -t man man/exa_colors.5.md | tee exa_colors.5 1> /dev/null' end def self.check -# system 'cargo test --all' + system 'cargo test --all -v' end def self.install - system "install -Dm755 target/release/exa #{CREW_DEST_PREFIX}/bin/exa" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin/" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/bash-completion/completions/" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/zsh/site-functions/" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/fish/vendor_completions.d/" + FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man1/" + FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man5/" + FileUtils.install 'target/release/exa', "#{CREW_DEST_PREFIX}/bin/exa", mode: 0o755 + FileUtils.install 'completions/completions.bash', "#{CREW_DEST_PREFIX}/share/bash-completion/completions/exa", mode: 0o644 + FileUtils.install 'completions/completions.zsh', "#{CREW_DEST_PREFIX}/share/zsh/site-functions/_exa", mode: 0o644 + FileUtils.install 'completions/completions.fish', "#{CREW_DEST_PREFIX}/share/fish/vendor_completions.d/exa.fish", mode: 0o644 + FileUtils.install 'exa.1', "#{CREW_DEST_MAN_PREFIX}/man1/exa.1", mode: 0o644 + FileUtils.install 'exa_colors.5', "#{CREW_DEST_MAN_PREFIX}/man5/exa_colors.5", mode: 0o644 end end diff --git a/packages/libgit2.rb b/packages/libgit2.rb index 598cbfb23..4bf863255 100644 --- a/packages/libgit2.rb +++ b/packages/libgit2.rb @@ -3,24 +3,24 @@ require 'package' class Libgit2 < Package description 'A portable, pure C implementation of the Git core methods' homepage 'https://libgit2.org/' - @_ver = '1.1.0' + @_ver = '1.4.2' version @_ver license 'GPL-2-with-linking-exception' compatibility 'all' - source_url "https://github.com/libgit2/libgit2/releases/download/v#{@_ver}/libgit2-#{@_ver}.tar.gz" - source_sha256 'ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba' + source_url 'https://github.com/libgit2/libgit2.git' + git_hashtag "v#{@_ver}" - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.1.0_armv7l/libgit2-1.1.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.1.0_armv7l/libgit2-1.1.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.1.0_i686/libgit2-1.1.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.1.0_x86_64/libgit2-1.1.0-chromeos-x86_64.tar.xz', + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.4.2_armv7l/libgit2-1.4.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.4.2_armv7l/libgit2-1.4.2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.4.2_i686/libgit2-1.4.2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libgit2/1.4.2_x86_64/libgit2-1.4.2-chromeos-x86_64.tar.zst' }) - binary_sha256 ({ - aarch64: '6ace517ea3525066a11071ed20e02eda6862bd944ceaf4f704c2f28b5f0bc6ac', - armv7l: '6ace517ea3525066a11071ed20e02eda6862bd944ceaf4f704c2f28b5f0bc6ac', - i686: '560685b52825f1bd4c3e6e45b328dec6a68f31d4d8c91ea2129626c0a7b39e9d', - x86_64: 'a12810a16d4a054a1a7d05925743562bf28e2b6e5f1c5f0db22f82a87208f7e9', + binary_sha256({ + aarch64: '8f893a29c3c3cf66a868fe6a02fe60f20c854d1b1b0dc5585550df52947679fb', + armv7l: '8f893a29c3c3cf66a868fe6a02fe60f20c854d1b1b0dc5585550df52947679fb', + i686: '328bb033fc1eaf16bac59a5b84264c7d138bc2d40750c6af78419e1c59ef286f', + x86_64: 'f9db9f7f7cf14110f58447f7fada36b6f6b137a5b11fcf1eadc9218fc2b89e7e' }) depends_on 'python3' @@ -29,16 +29,19 @@ class Libgit2 < Package def self.build Dir.mkdir 'builddir' Dir.chdir 'builddir' do - system "env #{CREW_ENV_OPTIONS} \ - cmake \ - -G Ninja \ - #{CREW_CMAKE_OPTIONS} \ - .." - system 'ninja' + system "cmake -G Ninja #{CREW_CMAKE_OPTIONS} \ + -DUSE_SSH=ON \ + -Wno-dev .." + system 'samu' end end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install" + end + + def self.check + # Tests #3 and #8 fail in containers + # system 'samu -C builddir test' end end diff --git a/packages/rust.rb b/packages/rust.rb index b4ab1794d..4ce53f2f6 100644 --- a/packages/rust.rb +++ b/packages/rust.rb @@ -3,23 +3,23 @@ require 'package' class Rust < Package description 'Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.' homepage 'https://www.rust-lang.org/' - @_ver = '1.58.1' + @_ver = '1.59.0' version @_ver license 'Apache-2.0 and MIT' compatibility 'all' source_url 'SKIP' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.58.1_armv7l/rust-1.58.1-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.58.1_armv7l/rust-1.58.1-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.58.1_i686/rust-1.58.1-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.58.1_x86_64/rust-1.58.1-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.59.0_armv7l/rust-1.59.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.59.0_armv7l/rust-1.59.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.59.0_i686/rust-1.59.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.59.0_x86_64/rust-1.59.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '60677690caf002b105f3e1e9137080afc5b562f53733215a40e376f934ff3ffe', - armv7l: '60677690caf002b105f3e1e9137080afc5b562f53733215a40e376f934ff3ffe', - i686: 'db998b356fb63c09090e8c6fd4c1d2b11a0df078a75f3f9dc9de26ee85ff3083', - x86_64: 'c4d7a66186280236e5024ae665a00c85d202dbb4ed991be659728e488e920524' + aarch64: 'dbf49ca3d439fdf5c88e11925d71af44454f11690ffa53276140ce8721d460bd', + armv7l: 'dbf49ca3d439fdf5c88e11925d71af44454f11690ffa53276140ce8721d460bd', + i686: 'dce519b03936ae60d9aea5630549a3d079193dd5da2217e2af2377b0259aff9a', + x86_64: 'ec32f15f83ca611963f96cf76a59692d074a34f9c48b86544e81d77b50ae5db6' }) def self.install