From d29c7bf5dd9f351abbdd842c4ceea01778f41dd7 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 13:49:53 +0200 Subject: [PATCH 1/2] New package: eza-0.12.0 --- srcpkgs/eza/patches/downgrade-git2.patch | 13 ++++++++++++ srcpkgs/eza/template | 26 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 srcpkgs/eza/patches/downgrade-git2.patch create mode 100644 srcpkgs/eza/template diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch new file mode 100644 index 0000000000000..9f4eb5bee96aa --- /dev/null +++ b/srcpkgs/eza/patches/downgrade-git2.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index e6c3e0e..39a34d0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -59,7 +59,7 @@ default-features = false + features = ["format"] + + [dependencies.git2] +-version = "0.18" ++version = "0.17" + optional = true + default-features = false + diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template new file mode 100644 index 0000000000000..9a94658f2022d --- /dev/null +++ b/srcpkgs/eza/template @@ -0,0 +1,26 @@ +# Template file for 'eza' +pkgname=eza +version=0.12.0 +revision=1 +build_style=cargo +hostmakedepends="pkg-config" +makedepends="libgit2-devel" +short_desc="Modern, maintained replacement for ls" +maintainer="Marcin Puc " +license="MIT" +homepage="https://github.com/eza-community/eza" +changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md" +distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz" +checksum=766e754c9f4632b92e4a773ac496dee8b6b83fdc9b8ed9514750058039fc5a83 + +post_patch() { + cargo update --package git2@0.18.0 --precise 0.17.2 +} + +post_install() { + vcompletion completions/bash/eza bash + vcompletion completions/fish/eza.fish fish + vcompletion completions/zsh/_eza zsh + + vlicense LICENCE +} From b98d62cc44d60b80ec605df898cf145fe1784f96 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 13:53:36 +0200 Subject: [PATCH 2/2] exa: transition to eza --- srcpkgs/exa | 1 + .../patches/0001-Update-lockfile-854.patch | 129 ------------------ srcpkgs/exa/template | 32 ----- srcpkgs/eza/template | 10 ++ 4 files changed, 11 insertions(+), 161 deletions(-) create mode 120000 srcpkgs/exa delete mode 100644 srcpkgs/exa/patches/0001-Update-lockfile-854.patch delete mode 100644 srcpkgs/exa/template diff --git a/srcpkgs/exa b/srcpkgs/exa new file mode 120000 index 0000000000000..5144458cfc4aa --- /dev/null +++ b/srcpkgs/exa @@ -0,0 +1 @@ +eza \ No newline at end of file diff --git a/srcpkgs/exa/patches/0001-Update-lockfile-854.patch b/srcpkgs/exa/patches/0001-Update-lockfile-854.patch deleted file mode 100644 index 6b44fa814a490..0000000000000 --- a/srcpkgs/exa/patches/0001-Update-lockfile-854.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 90b97753adb630513d68be7e66410e2b149ea446 Mon Sep 17 00:00:00 2001 -From: Haren S -Date: Mon, 26 Apr 2021 22:37:32 +0100 -Subject: [PATCH] Update lockfile (#854) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update lockfile (exa now requires Rust 1.45.2 or higher) - -Co-authored-by: Mélanie Chauvel ---- - .travis.yml | 2 +- - Cargo.lock | 22 +++++++++++----------- - README.md | 6 +++--- - 3 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index cc98081..1f08108 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -1,6 +1,6 @@ - language: rust - rust: -- - 1.42.0 -+ - 1.45.2 - - stable - - beta - - nightly -diff --git a/Cargo.lock b/Cargo.lock -index df94188..6a0665d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,7 +57,7 @@ dependencies = [ - - [[package]] - name = "exa" --version = "0.11.0-pre" -+version = "0.10.1" - dependencies = [ - "ansi_term", - "datetime", -@@ -90,9 +90,9 @@ dependencies = [ - - [[package]] - name = "git2" --version = "0.13.17" -+version = "0.13.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1d250f5f82326884bd39c2853577e70a121775db76818ffa452ed1e80de12986" -+checksum = "b483c6c2145421099df1b4efd50e0f6205479a072199460eff852fa15e5603c7" - dependencies = [ - "bitflags", - "libc", -@@ -119,9 +119,9 @@ dependencies = [ - - [[package]] - name = "idna" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" -+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" - dependencies = [ - "matches", - "unicode-bidi", -@@ -130,9 +130,9 @@ dependencies = [ - - [[package]] - name = "jobserver" --version = "0.1.21" -+version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" -+checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" - dependencies = [ - "libc", - ] -@@ -151,9 +151,9 @@ checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" - - [[package]] - name = "libgit2-sys" --version = "0.12.18+1.1.0" -+version = "0.12.19+1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885" -+checksum = "f322155d574c8b9ebe991a04f6908bb49e68a79463338d24a43d6274cb6443e6" - dependencies = [ - "cc", - "libc", -@@ -357,9 +357,9 @@ dependencies = [ - - [[package]] - name = "vcpkg" --version = "0.2.11" -+version = "0.2.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" -+checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" - - [[package]] - name = "winapi" -diff --git a/README.md b/README.md -index 1939928..898394d 100644 ---- a/README.md -+++ b/README.md -@@ -201,8 +201,8 @@ To build without Git support, run `cargo install --no-default-features exa` is a - -

Development - -- -- Rust 1.42+ -+ -+ Rust 1.45.2+ - - - -@@ -211,7 +211,7 @@ To build without Git support, run `cargo install --no-default-features exa` is a -

- - exa is written in [Rust](https://www.rust-lang.org/). --You will need rustc version 1.42.0 or higher. -+You will need rustc version 1.45.2 or higher. - The recommended way to install Rust for development is from the [official download page](https://www.rust-lang.org/tools/install), using rustup. - - Once Rust is installed, you can compile exa with Cargo: --- -2.40.0 - diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template deleted file mode 100644 index 89bf6611d9fbc..0000000000000 --- a/srcpkgs/exa/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'exa' -pkgname=exa -version=0.10.1 -revision=4 -create_wrksrc=yes -build_wrksrc="${pkgname}-${version}" -build_style=cargo -hostmakedepends="pkg-config" -makedepends="libgit2-devel" -short_desc="Modern replacement for ls" -maintainer="Marcin Puc " -license="MIT" -homepage="https://the.exa.website/" -distfiles="https://github.com/ogham/exa/archive/refs/tags/v${version}.tar.gz - https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip" -checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c - 531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849" -patch_args="-Np1 -d ${build_wrksrc}" - -post_extract() { - mkdir "${build_wrksrc}/accoutrements" - mv man "${build_wrksrc}/accoutrements/" -} - -post_install() { - vcompletion completions/completions.bash bash - vcompletion completions/completions.fish fish - vcompletion completions/completions.zsh zsh - vlicense LICENCE - vman accoutrements/man/exa.1 - vman accoutrements/man/exa_colors.5 -} diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template index 9a94658f2022d..32d8d01749595 100644 --- a/srcpkgs/eza/template +++ b/srcpkgs/eza/template @@ -23,4 +23,14 @@ post_install() { vcompletion completions/zsh/_eza zsh vlicense LICENCE + + ln -s eza ${DESTDIR}/usr/bin/exa +} + +exa_package() { + depends="eza-${version}_${revision}" + short_desc+=" - transitional dummy package" + pkg_install() { + vmove usr/bin/exa + } }