[PATCH rust-team 0/5] Fix cargo-inputs labels.

  • Open
  • quality assurance status badge
Details
One participant
  • Herman Rimm
Owner
unassigned
Submitted by
Herman Rimm
Severity
normal
H
H
Herman Rimm wrote 4 days ago
(address . guix-patches@gnu.org)
cover.1738400813.git.herman@rimm.ee
Hello,

The first revision removes the labels, the second revision fixes them.

Cheers,
Herman

Herman Rimm (5):
gnu: rust-nitrokey-test-0.5: Remove cargo-inputs labels.
gnu: rust-progressing-3: Remove cargo-inputs labels.
gnu: rust-rand-core-0.3: Remove cargo-inputs labels.
gnu: rust-ammonia-4: Remove cargo-inputs labels.
gnu: rust-winapi-0.3: Remove cargo-inputs labels.

gnu/packages/crates-io.scm | 17 ++++++-----------
gnu/packages/crates-web.scm | 16 +++++++++-------
gnu/packages/crates-windows.scm | 6 +++---
3 files changed, 18 insertions(+), 21 deletions(-)


base-commit: 986245daca2fb50d58cf0f2b9273f0d670d38af2
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team 1/5] gnu: rust-nitrokey-test-0.5: Remove cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
83dc12e42c0fa08a5d790b92fd1dff29365d3247.1738400813.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-nitrokey-test-0.5)[cargo-inputs]
Remove labels.

Change-Id: Iddfdfff44d728763e55da60ed5c7c8de4c790b37
---
gnu/packages/crates-io.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e769de77233..d19f90f8987 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45445,11 +45445,9 @@ (define-public rust-nitrokey-test-0.5
"197j9r2s4ydzbqfydza6v31mgcsgd29jpidz4psqawjdm49f8lg6"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t ; Wants an older version of rust-nitrokey.
- #:cargo-inputs
- (("rust-proc-macro2" ,rust-proc-macro2-1)
- ("quote" ,rust-quote-1)
- ("syn" ,rust-syn-1))))
+ (list #:skip-build? #t ; Wants an older version of rust-nitrokey.
+ #:cargo-inputs
+ (list rust-proc-macro2-1 rust-quote-1 rust-syn-1)))
(home-page "https://github.com/d-e-s-o/nitrokey-test")
(synopsis "Supporting test infrastructure for the nitrokey crate")
(description
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team 2/5] gnu: rust-progressing-3: Remove cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
a539fddb30f8edc1e831fb81eb58bc87b0326634.1738400813.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-progressing-3)[cargo-inputs]: Remove
labels.

Change-Id: Ia3004caca651032ac6bf1ae980f0a7307e329882
---
gnu/packages/crates-io.scm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

Toggle diff (17 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d19f90f8987..4da960a1a13 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57192,9 +57192,7 @@ (define-public rust-progressing-3
(base32
"06sb1cxpkc8lx56s76c95cfljs0513nsnn35wd6w79sblwcxpdwp"))))
(build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs
- (("log" ,rust-log-0.4))))
+ (arguments (list #:cargo-inputs (list rust-log-0.4)))
(home-page "https://github.com/dominicparga/progressing")
(synopsis "Counting progress-bar for Rust")
(description
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team 3/5] gnu: rust-rand-core-0.3: Remove cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
a9d7ee2c5c45e7a21b1a4abb383ca9143f9fc173.1738400813.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-rand-core-0.3)[arguments]: Build
without tests. Remove cargo-inputs labels.

Change-Id: I50877d153d55ce27566c2bfc1b126077140c8477
---
gnu/packages/crates-io.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4da960a1a13..3e205a4b6d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61139,9 +61139,8 @@ (define-public rust-rand-core-0.3
(base32
"0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs"))))
;; This version is a 0.3 API wrapper around the 0.4 version.
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rand-core" ,rust-rand-core-0.4))))))
+ (arguments (list #:tests? #f
+ #:cargo-inputs (list rust-rand-core-0.4)))))
(define-public rust-rand-core-0.2
(package
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team 4/5] gnu: rust-ammonia-4: Remove cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
f036a6450d0b3e5dbe2a6eda3545896e21ad7c51.1738400813.git.herman@rimm.ee
* gnu/packages/crates-web.scm (rust-ammonia-4)[cargo-inputs,
cargo-development-inputs]: Remove labels.

Change-Id: Ib705af6bd51d488bcc1780c128e609b44f74455f
---
gnu/packages/crates-web.scm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 73ca29df761..6a8b1ff2027 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -1952,13 +1952,15 @@ (define-public rust-ammonia-4
(base32 "0nd432yg1cl9kj4i9c37a9hvwffayqh6zsvb4fmh31g5bsp9xf8s"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("html5ever" ,rust-html5ever-0.27)
- ("maplit" ,rust-maplit-1)
- ("tendril" ,rust-tendril-0.4)
- ("url" ,rust-url-2)
- ("once_cell" ,rust-once-cell-1))
- #:cargo-development-inputs (("version-sync" ,rust-version-sync-0.9)
- ("env_logger" ,rust-env-logger-0.10))))
+ (list #:cargo-inputs
+ (list rust-html5ever-0.27
+ rust-maplit-1
+ rust-tendril-0.4
+ rust-url-2
+ rust-once-cell-1)
+ #:cargo-development-inputs
+ (list rust-version-sync-0.9
+ rust-env-logger-0.10)))
(home-page "https://github.com/rust-ammonia/ammonia")
(synopsis "Repair and secure untrusted HTML")
(description "Ammonia is a whitelist-based HTML sanitization library.
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team 5/5] gnu: rust-winapi-0.3: Remove cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
73f05017f5f679b43ea593ac1eeb510467e04276.1738400813.git.herman@rimm.ee
* gnu/packages/crates-windows.scm (rust-winapi-0.3)[cargo-inputs]:
Remove labels.

Change-Id: Iddfdfff44d728763e55da60ed5c7c8de4c790b37
---
gnu/packages/crates-windows.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 2f212190ddf..5f2034159ab 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -971,9 +971,9 @@ (define-public rust-winapi-0.3
(build-system cargo-build-system)
;; This package depends unconditionally on these two crates.
(arguments
- `(#:cargo-inputs
- (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
- ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
+ (list #:cargo-inputs
+ (list rust-winapi-i686-pc-windows-gnu-0.4
+ rust-winapi-x86-64-pc-windows-gnu-0.4)))
(inputs
(list rust-winapi-i686-pc-windows-gnu-0.4
rust-winapi-x86-64-pc-windows-gnu-0.4))
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team v2 1/5] gnu: rust-nitrokey-test-0.5: Fix cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
e651d78d926794b75c743da06cf32a7b0fcb9d6f.1738400603.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-nitrokey-test-0.5)[cargo-inputs]
Fix labels.

Change-Id: Iddfdfff44d728763e55da60ed5c7c8de4c790b37
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e769de77233..af1c403e757 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45448,8 +45448,8 @@ (define-public rust-nitrokey-test-0.5
`(#:skip-build? #t ; Wants an older version of rust-nitrokey.
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
- ("quote" ,rust-quote-1)
- ("syn" ,rust-syn-1))))
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/d-e-s-o/nitrokey-test")
(synopsis "Supporting test infrastructure for the nitrokey crate")
(description

base-commit: 986245daca2fb50d58cf0f2b9273f0d670d38af2
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team v2 2/5] gnu: rust-progressing-3: Fix cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
3de54354b3382a52a3354b22cd50be5a56a297a9.1738400603.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-progressing-3)[cargo-inputs]: Fix
labels.

Change-Id: Ia3004caca651032ac6bf1ae980f0a7307e329882
---
gnu/packages/crates-io.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af1c403e757..150bf331278 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57196,7 +57196,7 @@ (define-public rust-progressing-3
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("log" ,rust-log-0.4))))
+ (("rust-log" ,rust-log-0.4))))
(home-page "https://github.com/dominicparga/progressing")
(synopsis "Counting progress-bar for Rust")
(description
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team v2 3/5] gnu: rust-rand-core-0.3: Fix cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
997bb573be2ab9703e4afdddbd478cae91f3f4b4.1738400604.git.herman@rimm.ee
* gnu/packages/crates-io.scm (rust-rand-core-0.3)[cargo-inputs]: Fix
labels.

Change-Id: I50877d153d55ce27566c2bfc1b126077140c8477
---
gnu/packages/crates-io.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 150bf331278..b66599410dd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61145,7 +61145,7 @@ (define-public rust-rand-core-0.3
;; This version is a 0.3 API wrapper around the 0.4 version.
(arguments
`(#:skip-build? #t
- #:cargo-inputs (("rand-core" ,rust-rand-core-0.4))))))
+ #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.4))))))
(define-public rust-rand-core-0.2
(package
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team v2 4/5] gnu: rust-ammonia-4: Fix cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
306548c3bdfd3e3ff0e14a4deaf8987127ee20da.1738400604.git.herman@rimm.ee
* gnu/packages/crates-web.scm (rust-ammonia-4)[cargo-inputs,
cargo-development-inputs]: Fix labels.

Change-Id: Ib705af6bd51d488bcc1780c128e609b44f74455f
---
gnu/packages/crates-web.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

Toggle diff (28 lines)
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 73ca29df761..9639604ebb1 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -1952,13 +1952,14 @@ (define-public rust-ammonia-4
(base32 "0nd432yg1cl9kj4i9c37a9hvwffayqh6zsvb4fmh31g5bsp9xf8s"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("html5ever" ,rust-html5ever-0.27)
- ("maplit" ,rust-maplit-1)
- ("tendril" ,rust-tendril-0.4)
- ("url" ,rust-url-2)
- ("once_cell" ,rust-once-cell-1))
- #:cargo-development-inputs (("version-sync" ,rust-version-sync-0.9)
- ("env_logger" ,rust-env-logger-0.10))))
+ `(#:cargo-inputs (("rust-html5ever" ,rust-html5ever-0.27)
+ ("rust-maplit" ,rust-maplit-1)
+ ("rust-tendril" ,rust-tendril-0.4)
+ ("rust-url" ,rust-url-2)
+ ("rust-once_cell" ,rust-once-cell-1))
+ #:cargo-development-inputs
+ (("rust-version-sync" ,rust-version-sync-0.9)
+ ("rust-env_logger" ,rust-env-logger-0.10))))
(home-page "https://github.com/rust-ammonia/ammonia")
(synopsis "Repair and secure untrusted HTML")
(description "Ammonia is a whitelist-based HTML sanitization library.
--
2.47.1
H
H
Herman Rimm wrote 4 days ago
[PATCH rust-team v2 5/5] gnu: rust-winapi-0.3: Fix cargo-inputs labels.
(address . 75987@debbugs.gnu.org)
3bd9396fe7e61b28b2445dbdcc5be55869b3c535.1738400604.git.herman@rimm.ee
* gnu/packages/crates-windows.scm (rust-winapi-0.3)[cargo-inputs]: Fix
labels.

Change-Id: Iddfdfff44d728763e55da60ed5c7c8de4c790b37
---
gnu/packages/crates-windows.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 2f212190ddf..619504ff042 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -972,8 +972,10 @@ (define-public rust-winapi-0.3
;; This package depends unconditionally on these two crates.
(arguments
`(#:cargo-inputs
- (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
- ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
+ (("rust-winapi-i686-pc-windows-gnu"
+ ,rust-winapi-i686-pc-windows-gnu-0.4)
+ ("rust-winapi-x86-64-pc-windows-gnu"
+ ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
(inputs
(list rust-winapi-i686-pc-windows-gnu-0.4
rust-winapi-x86-64-pc-windows-gnu-0.4))
--
2.47.1
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 75987@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 75987
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch