Re: [PR PATCH] [Updated] RFC: common/build-style/cargo.sh: use --locked for build and check as well

Github messages for voidlinux
 help / color / mirror / Atom feed

From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] RFC: common/build-style/cargo.sh: use --locked for build and check as well
Date: Sat, 08 Apr 2023 20:29:16 +0200	[thread overview]
Message-ID: <20230408182916.Oas7xCbsH5i9Luyd5FAYUxWr_xPLmV34eOz8-0XfUkw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43233@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages locked-cargo
https://github.com/void-linux/void-packages/pull/43233

RFC: common/build-style/cargo.sh: use --locked for build and check as well
#### 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**|**NO**
-->

<!-- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/43233.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-locked-cargo-43233.patch --]
[-- Type: text/x-diff, Size: 28145 bytes --]

From c108b6803e997443c5df6973e97cd6ed89c43047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 2 Apr 2023 16:25:24 +0200
Subject: [PATCH 01/12] common/build-style/cargo.sh: use --locked for build and
 check as well

---
 common/build-style/cargo.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 387e711060bc..751911d8dbee 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,14 +5,14 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
+	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
-		${make_check_args}
+	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+		${configure_args} ${make_check_args}
 }
 
 do_install() {

From 55b00afb511f503daa6efe4ff36c58339c0e695e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 3 Apr 2023 08:49:10 +0200
Subject: [PATCH 02/12] cargo-update: generate lockfile

---
 srcpkgs/cargo-update/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index f892886fca3f..f31800e0abe0 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
 version=13.0.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
 makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
@@ -18,6 +18,13 @@ if [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
 	make_check_args="-- --skip ops::assert_index_path"
 fi
 
+post_patch() {
+	# Upstream does not ship a lockfile and is very vocal about that being
+	# the right way:
+	# https://github.com/nabijaczleweli/cargo-update/issues/50
+	cargo generate-lockfile
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md

From 6dd84c8b9a2c54dd8601cfbb310e2ffbc92493ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 17:52:44 +0200
Subject: [PATCH 03/12] alert-after: patch lockfile

---
 .../patches/0001-Update-Cargo.lock.patch      | 155 ++++++++++++++++++
 srcpkgs/alert-after/template                  |   2 +-
 2 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/alert-after/patches/0001-Update-Cargo.lock.patch

diff --git a/srcpkgs/alert-after/patches/0001-Update-Cargo.lock.patch b/srcpkgs/alert-after/patches/0001-Update-Cargo.lock.patch
new file mode 100644
index 000000000000..c0d727f8c2c5
--- /dev/null
+++ b/srcpkgs/alert-after/patches/0001-Update-Cargo.lock.patch
@@ -0,0 +1,155 @@
+From f4141915692ee8cc437209aaa6f507fc372792ed Mon Sep 17 00:00:00 2001
+From: Corey Farwell <coreyf@rwell.org>
+Date: Wed, 10 Apr 2019 06:36:39 -0400
+Subject: [PATCH] Update Cargo.lock
+
+---
+ Cargo.lock | 61 +++++++-----------------------------------------------
+ 1 file changed, 8 insertions(+), 53 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index de84926..038c9ca 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2,9 +2,9 @@
+ # It is not intended for manual editing.
+ [[package]]
+ name = "alert-after"
+-version = "1.5.0"
++version = "1.5.1"
+ dependencies = [
+- "notifica 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "notifica 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -154,12 +154,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "notifica"
+-version = "1.0.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "mac-notification-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "notify-rust 3.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winrt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -211,24 +211,6 @@ dependencies = [
+  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "ole32-sys"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "oleaut32-sys"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "pkg-config"
+ version = "0.3.14"
+@@ -255,15 +237,6 @@ name = "redox_syscall"
+ version = "0.1.53"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+-[[package]]
+-name = "runtimeobject-sys"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+ [[package]]
+ name = "rustc-demangle"
+ version = "0.1.13"
+@@ -305,11 +278,6 @@ name = "unicode-xid"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+-[[package]]
+-name = "winapi"
+-version = "0.2.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "winapi"
+ version = "0.3.7"
+@@ -319,11 +287,6 @@ dependencies = [
+  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+-[[package]]
+-name = "winapi-build"
+-version = "0.1.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "winapi-i686-pc-windows-gnu"
+ version = "0.4.0"
+@@ -336,13 +299,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "winrt"
+-version = "0.3.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "oleaut32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "runtimeobject-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [metadata]
+@@ -364,28 +324,23 @@ dependencies = [
+ "checksum mac-notification-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a3639b6caa2db7443e5df80e12c450982f77fc3c140f53d6e48be91f965ea66"
+ "checksum mac-notification-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f588a226cfab0536c23ef64ce521d2a0469315731460c6f924b39d162bc162"
+ "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+-"checksum notifica 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc6d2270aa8b606c081c25f2d06b870e3c9226b0e7b98e63b990bdb390cb488"
++"checksum notifica 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e4bf0be3d0aa13ec1467834b3b4d0a3fdee1215c7483b9b54b31fd4dad356814"
+ "checksum notify-rust 3.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46d847abfe6489a4f7817ec893efeb27f8250755b2272bfa933bcf69af4bda42"
+ "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+ "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
+ "checksum objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "31d20fd2b37e07cf5125be68357b588672e8cefe9a96f8c17a9d46053b3e590d"
+ "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+ "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+-"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
+-"checksum oleaut32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fde17b30b27384afd9a5b02c5429cc356b82263f4bd15e5661c5df9e9df612f"
+ "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
+ "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+ "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
+ "checksum redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)" = "53848511b7ee6eb9d5c3db48481aaa5779b38fc0131bc133c98cb4f2b2411928"
+-"checksum runtimeobject-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2222472d6d46b6a047029b80a766759879590fa1d31a531456eff0cd855b273"
+ "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
+ "checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
+ "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
+ "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+ "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+ "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+ "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+ "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+-"checksum winrt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce322394c4d48755ad50fc867ffb70b433a336944935c3098b4e1ca4bbb0870a"
++"checksum winrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4c01eac5a45f4fcb31db47886257ff0b0ec8958b581ff841b0d992a7e97f94"
+-- 
+2.40.0
+
diff --git a/srcpkgs/alert-after/template b/srcpkgs/alert-after/template
index 27dcd62231e3..8345dc519624 100644
--- a/srcpkgs/alert-after/template
+++ b/srcpkgs/alert-after/template
@@ -1,7 +1,7 @@
 # Template file for 'alert-after'
 pkgname=alert-after
 version=1.5.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel"

From 516f709a0293266b46a80dd8e80ca45c34eded6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 18:07:02 +0200
Subject: [PATCH 04/12] blindfold: generate lockfile

---
 srcpkgs/blindfold/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index ee605e767102..8c9306e69f7c 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,7 +1,7 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -12,6 +12,12 @@ homepage="https://github.com/Eoin-McMahon/blindfold"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=eff539920d4efa5c0fc35067c40347ceb8b01a922f443460a28e8c5e0b3237ca
 
+post_patch() {
+	# Upstream does not ship a lockfile yet:
+	# https://github.com/Eoin-McMahon/blindfold/issues/23
+	cargo generate-lockfile
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 96c591b13d643c2e2283781fe9505c0dd005cc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 18:15:15 +0200
Subject: [PATCH 05/12] desed: generate lockfile

---
 srcpkgs/desed/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/desed/template b/srcpkgs/desed/template
index 2f163115a797..e6f854bc90ee 100644
--- a/srcpkgs/desed/template
+++ b/srcpkgs/desed/template
@@ -1,7 +1,7 @@
 # Template file for 'desed'
 pkgname=desed
 version=1.2.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Demystify and debug sed scripts"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -9,3 +9,9 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/SoptikHa2/desed"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=bee8c60d58f11472c036277b0318bdceb5520cce5a61965bc028b26ccbdeb706
+
+post_patch() {
+	# Upstream does not ship a lockfile yet:
+	# https://github.com/SoptikHa2/desed/issues/27
+	cargo generate-lockfile
+}

From 0b4cfe9aac8400bdffa40c967da56355a2b6f73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 18:25:34 +0200
Subject: [PATCH 06/12] exa: patch lockfile

---
 .../patches/0001-Update-lockfile-854.patch    | 129 ++++++++++++++++++
 srcpkgs/exa/template                          |   3 +-
 2 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/exa/patches/0001-Update-lockfile-854.patch

diff --git a/srcpkgs/exa/patches/0001-Update-lockfile-854.patch b/srcpkgs/exa/patches/0001-Update-lockfile-854.patch
new file mode 100644
index 000000000000..6b44fa814a49
--- /dev/null
+++ b/srcpkgs/exa/patches/0001-Update-lockfile-854.patch
@@ -0,0 +1,129 @@
+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
index 248fda1e8188..ec5649613174 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,7 +1,7 @@
 # Template file for 'exa'
 pkgname=exa
 version=0.10.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=cargo
@@ -15,6 +15,7 @@ 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"

From 177f98f3cd9b9b9bff391d5835cbe843fc5b80dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 18:53:19 +0200
Subject: [PATCH 07/12] nasa-wallpaper: generate lockfile

---
 srcpkgs/nasa-wallpaper/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index be30791e780a..604b0f695f8e 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,7 +1,7 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=3
+revision=4
 build_style="cargo"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -11,3 +11,9 @@ license="Apache-2.0"
 homepage="https://github.com/davidpob99/nasa-wallpaper/"
 distfiles="https://github.com/davidpob99/nasa-wallpaper/archive/v${version}.tar.gz"
 checksum=5bdf85cabc954069f7188f32c5579a6d47aae1781bc438bead7d7a0af335f5f8
+
+post_patch() {
+       # Upstream does not ship a lockfile yet:
+       # https://github.com/davidpob99/nasa-wallpaper/issues/12
+       cargo generate-lockfile
+}

From b551f79c197eff6bc9301be1bc4bfeccb5aeb8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 19:01:24 +0200
Subject: [PATCH 08/12] pijul: generate lockfile

---
 srcpkgs/pijul/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index a6a6d048b1ec..ba0d9c8def65 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,7 +1,7 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=5
+revision=6
 create_wrksrc=yes
 build_style=cargo
 _sequoia_ver=0.9.0
@@ -21,6 +21,11 @@ post_extract() {
 	mv sequoia-* sequoia
 }
 
+post_patch() {
+	# Upstream does not ship a lockfile yet
+	cargo generate-lockfile
+}
+
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul

From 2084897fba54da1389c9f3e89e1a9d153d1be284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 19:21:06 +0200
Subject: [PATCH 09/12] sss-cli: patch lockfile

---
 .../patches/0001-Update-Cargo.lock.patch      | 34 +++++++++++++++++++
 srcpkgs/sss-cli/template                      |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sss-cli/patches/0001-Update-Cargo.lock.patch

diff --git a/srcpkgs/sss-cli/patches/0001-Update-Cargo.lock.patch b/srcpkgs/sss-cli/patches/0001-Update-Cargo.lock.patch
new file mode 100644
index 000000000000..9a9db8c77f98
--- /dev/null
+++ b/srcpkgs/sss-cli/patches/0001-Update-Cargo.lock.patch
@@ -0,0 +1,34 @@
+From 38727743d904261ac74caa3750ef801ba88092ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sat, 8 Apr 2023 19:18:31 +0200
+Subject: [PATCH] Update Cargo.lock
+
+---
+ Cargo.lock | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index a57c5d8..27278d9 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,5 +1,7 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
++version = 3
++
+ [[package]]
+ name = "aho-corasick"
+ version = "0.7.15"
+@@ -253,7 +255,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "shamirsecretsharing-cli"
+-version = "0.1.0"
++version = "0.1.1"
+ dependencies = [
+  "atty",
+  "clap",
+-- 
+2.40.0
+
diff --git a/srcpkgs/sss-cli/template b/srcpkgs/sss-cli/template
index 1d49663b2148..462c6b5892f1 100644
--- a/srcpkgs/sss-cli/template
+++ b/srcpkgs/sss-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'sss-cli'
 pkgname=sss-cli
 version=0.1.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Shamir's secret sharing scheme CLI tool"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"

From 8ba342c326bf2bf4469ca00a04e97a805cd31d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 19:28:40 +0200
Subject: [PATCH 10/12] svgcleaner: generate lockfile

---
 srcpkgs/svgcleaner/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/svgcleaner/template b/srcpkgs/svgcleaner/template
index 8f4c9cde387a..98cd332dfec5 100644
--- a/srcpkgs/svgcleaner/template
+++ b/srcpkgs/svgcleaner/template
@@ -1,7 +1,7 @@
 # Template file for 'svgcleaner'
 pkgname=svgcleaner
 version=0.9.5
-revision=1
+revision=2
 build_style=cargo
 short_desc="Tool for reducing size of svg images without loss"
 maintainer="Alexander Mamay <alexander@mamay.su>"
@@ -9,3 +9,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/RazrFalcon/SVGCleaner"
 distfiles="https://github.com/RazrFalcon/SVGCleaner/archive/v${version}.tar.gz"
 checksum=dcf8dbc8939699e2e82141cb86688b6cd09da8cae5e18232ef14085c2366290c
+
+post_patch() {
+	# Upstream does not ship a lockfile yet:
+	cargo generate-lockfile
+}

From 22f5300b4aff681fe95126dc26b71ef2cb6b97f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 19:54:10 +0200
Subject: [PATCH 11/12] tmplgen: switch to git tag based tarball

---
 srcpkgs/tmplgen/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index f352a5f3fd60..f51cced3b077 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,7 +1,7 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=4
+revision=5
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -9,8 +9,10 @@ short_desc="Void Linux template generator for language-specific package managers
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Cogitri/tmplgen"
-distfiles="https://static.crates.io/crates/tmplgen/tmplgen-${version}.crate"
-checksum=5e5dc4b3e50f4f2dc87f510bb3d1547a86ecd5a52c0f33305a0a7a3dca40bee9
+distfiles="https://github.com/Cogitri/tmplgen/archive/refs/tags/v${version}.tar.gz"
+checksum=8c8aa5b65045614529626978852416a965d57c77dd5953be58bc84f8d8b27f9b
+# cba for now, tests weren't shipped in the previous tarballs
+make_check=no
 
 post_install() {
 	vman man/tmplgen.1

From 839b3303c2dee76885c53df13cb375ffd4e0b9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 8 Apr 2023 20:11:12 +0200
Subject: [PATCH 12/12] ugdb: replace Cargo.toml patch with cargo-update, fix
 oniguruma linking

---
 srcpkgs/ugdb/patches/i128.patch | 14 --------------
 srcpkgs/ugdb/template           |  9 ++++++++-
 2 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/ugdb/patches/i128.patch

diff --git a/srcpkgs/ugdb/patches/i128.patch b/srcpkgs/ugdb/patches/i128.patch
deleted file mode 100644
index 4496ca498d2c..000000000000
--- a/srcpkgs/ugdb/patches/i128.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bump some versions to get num-traits support for i128.
-
---- a/Cargo.toml
-+++ b/Cargo.toml:wq
-@@ -28,7 +28,8 @@
- rand = "0.3"
- unix_socket = "0.5"
- unicode-segmentation = "1.2"
--parse_int = "0.5"
-+parse_int = "0.6"
-+ndarray = "0.15.4"
- 
- unsegen = "0.3"
- unsegen_signals = "0.3"
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index a5a1ba695183..d1a9de0ece42 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,8 +1,10 @@
 # Template file for 'ugdb'
 pkgname=ugdb
 version=0.1.11
-revision=2
+revision=3
 build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="oniguruma-devel"
 checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -11,6 +13,11 @@ homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=d092356534774505b6b081b82db71d1fab1fbccdb814a44d4c435bafe5efd312
 
+post_patch() {
+	vsed -i Cargo.toml -e 's/parse_int = "0.5"/parse_int = "0.6"/'
+	cargo update --package parse_int:0.5.0 --precise 0.6.0
+}
+
 post_install() {
 	vlicense LICENSE
 }

next prev parent reply	other threads:[~2023-04-08 18:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-03  6:50 [PR PATCH] " jcgruenhage
2023-04-03  6:59 ` [PR PATCH] [Updated] RFC: " jcgruenhage
2023-04-03  9:00 ` stefankreutz
2023-04-03  9:57 ` jcgruenhage
2023-04-03 15:54 ` icp1994
2023-04-03 18:44 ` jcgruenhage
2023-04-03 19:12 ` icp1994
2023-04-04  1:21 ` classabbyamp
2023-04-04  8:43 ` jcgruenhage
2023-04-04  8:44 ` jcgruenhage
2023-04-08 18:11 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-08 18:29 ` jcgruenhage [this message]
2023-04-08 18:31 ` jcgruenhage
2023-04-13  5:01 ` classabbyamp
2023-04-13  5:59 ` jcgruenhage
2023-04-13 13:24 ` classabbyamp
2023-04-13 14:21 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-13 14:22 ` jcgruenhage
2023-04-13 14:27 ` jcgruenhage
2023-04-13 14:44 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-13 14:44 ` jcgruenhage
2023-04-13 15:52 ` jcgruenhage
2023-04-13 17:15 ` [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=20230408182916.Oas7xCbsH5i9Luyd5FAYUxWr_xPLmV34eOz8-0XfUkw@z \
    --to=jcgruenhage@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).