From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: eza-0.11.0, transition from exa
Date: Sat, 16 Sep 2023 15:51:09 +0200 [thread overview]
Message-ID: <20230916135109.j4nmzDBHShwQysZ3ZJ3dLIy4vrIN6XTr15SGU0RB7T0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45972@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages eza
https://github.com/void-linux/void-packages/pull/45972
New package: eza-0.11.0, transition from exa
- New package: eza-0.11.0
- exa: transition to eza
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
closes #45958
A patch file from https://github.com/void-linux/void-packages/pull/45972.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-eza-45972.patch --]
[-- Type: text/x-diff, Size: 8900 bytes --]
From d29c7bf5dd9f351abbdd842c4ceea01778f41dd7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
+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 <tranzystorek.io@protonmail.com>
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 <harens@macports.org>
-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 <perso@hack-libre.org>
----
- .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
- <a id="development">
- <h1>Development
-
--<a href="https://blog.rust-lang.org/2020/03/12/Rust-1.42.html">
-- <img src="https://img.shields.io/badge/rustc-1.42+-lightgray.svg" alt="Rust 1.42+" />
-+<a href="https://blog.rust-lang.org/2020/08/03/Rust-1.45.2.html">
-+ <img src="https://img.shields.io/badge/rustc-1.45.2+-lightgray.svg" alt="Rust 1.45.2+" />
- </a>
-
- <a href="https://github.com/ogham/exa/blob/master/LICENCE">
-@@ -211,7 +211,7 @@ To build without Git support, run `cargo install --no-default-features exa` is a
- </h1></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 <tranzystorek.io@protonmail.com>"
-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
+ }
}
next prev parent reply other threads:[~2023-09-16 13:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 11:59 [PR PATCH] " tranzystorek-io
2023-09-13 12:23 ` [PR PATCH] [Updated] " tranzystorek-io
2023-09-16 13:51 ` tranzystorek-io [this message]
2023-09-16 15:07 ` [PR REVIEW] New package: eza-0.12.0, " classabbyamp
2023-09-16 15:13 ` [PR PATCH] [Updated] " tranzystorek-io
2023-09-16 16:06 ` tranzystorek-io
2023-09-17 1:16 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230916135109.j4nmzDBHShwQysZ3ZJ3dLIy4vrIN6XTr15SGU0RB7T0@z \
--to=tranzystorek-io@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).