From: Aaron Covrig <aaron.covrig.us@ieee.org>
To: guix-patches@gnu.org
Cc: Aaron Covrig <aaron.covrig.us@ieee.org>
Subject: [PATCH rust-team 0/9] Build fixes and minor updates
Date: Sat, 8 Mar 2025 11:47:20 -0500
| Package | Source(s) | Maintainer(s) | |
|---|---|---|---|
| guix-patches | PTS Buildd Popcon |
Report forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:50:02 GMT) (full text, mbox, link).
Acknowledgement sent
to Aaron Covrig <aaron.covrig.us@ieee.org>:
New bug report received and forwarded. Copy sent to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org.
(Sat, 08 Mar 2025 16:50:02 GMT) (full text, mbox, link).
Message #5 received at submit@debbugs.gnu.org (full text, mbox, reply):
This patch contains a few fixes for some packages that fail to build and
updates a few other patches. The main change I want to call out is to
cargo-build-system.scm where I add another check to see if the cargo-test-flags
are `null`; I'm not sure how many packages were failing to build because of this,
but the following rust-criterion-0.4 package was failing to build before I
added this change. It looks to be caused by the inclusion of the `--test-threads`
support not having the leading `--` if the cargo-test-flags list is empty. I
don't have much scheme/guile experience, but I believe my code change here
could be combined with the previous line to be something like the following
pseudo code:
```
if !(member "--" cargo-test-flags) || if(nil? cargo-test-flags){
"--"
} else {
""
}
```
Aaron Covrig (9):
gnu: rust-serde-test-0.9: Fix build
gnu: rust-rustyline-derive-0.11: New variable.
gnu: rust-rustyline-15: New variable.
gnu: rust-rustyline-14: New variable.
gnu: rust-elf-0.7: New variable
gnu: rust-boxxy-0.14: New variable.
gnu: cargo-build-system: check: Add required cargo test string if
null.
gnu: rust-criterion-0.4: Address 2024 Cargo deprecation/rename
warning.
gnu: rust-futures-0.3: Address 2024 Cargo deprecation/rename warning
gnu/packages/crates-check.scm | 7 +-
gnu/packages/crates-io.scm | 228 ++++++++++++++++++++++++++----
guix/build/cargo-build-system.scm | 4 +
3 files changed, 212 insertions(+), 27 deletions(-)
base-commit: a21bbfb712c0b82b76d6099b454c2a1db8dd9924
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:01 GMT) (full text, mbox, link).
Message #8 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-serde-test-0.9): Fix build by
updating dependencies path
---
gnu/packages/crates-io.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 717e4ce7c1..57710d45d8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71807,7 +71807,8 @@ (define-public rust-serde-test-0.9
(base32 "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf"))
(modules '((guix build utils)))
(snippet #~(substitute* "Cargo.toml"
- ((", path =.*}") "}")))))
+ ((", path =.*}") "}")
+ (("../README.md") "README.md")))))
(arguments
`(#:cargo-inputs (("rust-serde" ,rust-serde-0.9))))))
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:02 GMT) (full text, mbox, link).
Message #11 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-derive-0.11): New variable.
---
gnu/packages/crates-io.scm | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57710d45d8..f0b193f082 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68815,17 +68815,17 @@ (define-public rust-rustyline-6
("rust-rustyline-derive" ,rust-rustyline-derive-0.3)
("rust-tempfile" ,rust-tempfile-3))))))
-(define-public rust-rustyline-derive-0.10
+(define-public rust-rustyline-derive-0.11
(package
(name "rust-rustyline-derive")
- (version "0.10.0")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "rustyline-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (base32 "03cfnk753gfbxhp13dbcg9b0vksmxzkinksrpxgy5xvdbw3rszij"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -68836,6 +68836,23 @@ (define-public rust-rustyline-derive-0.10
(description "This package provides Rustyline macros implementation in Rust.")
(license license:expat)))
+(define-public rust-rustyline-derive-0.10
+ (package
+ (inherit rust-rustyline-derive-0.11)
+ (name "rust-rustyline-derive")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (arguments
+ `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))))))
+
(define-public rust-rustyline-derive-0.9
(package
(inherit rust-rustyline-derive-0.10)
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:02 GMT) (full text, mbox, link).
Message #14 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-15): New variable.
---
gnu/packages/crates-io.scm | 56 +++++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0b193f082..49ea57a60d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68617,8 +68617,56 @@ (define-public rust-rusty-fork-0.2
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2))))))
+(define-public rust-rustyline-15
+ (package
+ (name "rust-rustyline")
+ (version "15.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.32)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.11)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.2)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-winapi" ,rust-windows-sys-0.59))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/kkawakam/rustyline")
+ (synopsis "Readline implementation in Rust")
+ (description
+ "Rustyline is a readline implementation based on the linenoise package.")
+ (license license:expat)))
+
(define-public rust-rustyline-13
(package
+ (inherit rust-rustyline-15)
(name "rust-rustyline")
(version "13.0.0")
(source
@@ -68628,7 +68676,6 @@ (define-public rust-rustyline-13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11mywskk2jcxhanlsgzza5yx6ywpdlzr64qhbgpsx45clj1xd8h2"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags '("--release" "--"
"--skip=binding::test::size_of_event")
@@ -68656,12 +68703,7 @@ (define-public rust-rustyline-13
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-env-logger" ,rust-env-logger-0.10)
("rust-rand" ,rust-rand-0.8)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://github.com/kkawakam/rustyline")
- (synopsis "Readline implementation in Rust")
- (description
- "Rustyline is a readline implementation based on the linenoise package.")
- (license license:expat)))
+ ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-rustyline-12
(package
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:03 GMT) (full text, mbox, link).
Message #17 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-14): New variable.
---
gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 49ea57a60d..efc5d2a4d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68630,9 +68630,7 @@ (define-public rust-rustyline-15
(base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
(build-system cargo-build-system)
(arguments
- `(;#:cargo-test-flags '("--release" "--"
- ; "--skip=binding::test::size_of_event")
- #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
("rust-buffer-redux" ,rust-buffer-redux-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-clipboard-win" ,rust-clipboard-win-5)
@@ -68664,10 +68662,52 @@ (define-public rust-rustyline-15
"Rustyline is a readline implementation based on the linenoise package.")
(license license:expat)))
-(define-public rust-rustyline-13
+(define-public rust-rustyline-14
(package
(inherit rust-rustyline-15)
(name "rust-rustyline")
+ (version "14.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qvyckd5hbi2cf6kw4bsng6vb6rb9dzjfy24dndzszm3dn9yh0vq"))))
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.28)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.31)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.10)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-windows-sys" ,rust-windows-sys-0.52))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-rustyline-13
+ (package
+ (inherit rust-rustyline-14)
+ (name "rust-rustyline")
(version "13.0.0")
(source
(origin
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:03 GMT) (full text, mbox, link).
Message #20 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-elf-0.7): New variable
---
gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index efc5d2a4d6..eb019434f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22706,10 +22706,10 @@ (define-public rust-elain-0.3
(description "Set a type's minimum alignment with const generics.")
(license (list license:expat license:asl2.0))))
-(define-public rust-elf-0.0.10
+(define-public rust-elf-0.7
(package
(name "rust-elf")
- (version "0.0.10")
+ (version "0.7.4")
(source
(origin
(method url-fetch)
@@ -22718,16 +22718,43 @@ (define-public rust-elf-0.0.10
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ "0yyij25ps8mln1s1xzwggjr88gb2b35c8jf8az25dmfvfaar0ia4"))))
+ (arguments `(#:cargo-test-flags '("--"
+ ;; Missing test files
+ "--skip=elf_bytes::arch_tests"
+ "--skip=elf_bytes::interface_tests"
+ "--skip=elf_stream::arch_tests"
+ "--skip=elf_stream::interface_tests"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes (line 33)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_header_by_name (line 304)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_headers_with_strtab (line 219)"
+ "--skip=src/elf_stream.rs - elf_stream::ElfStream<E,S>::section_header_by_name (line 212)"
+ "--skip=src/lib.rs - (line 83)"
+ "--skip=src/note.rs - note (line 4)")))
(build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))
(home-page "https://github.com/cole14/rust-elf/")
(synopsis "Library for parsing ELF files")
(description
"This package provides a pure-Rust library for parsing ELF files.")
(license (list license:expat license:asl2.0))))
+(define-public rust-elf-0.0.10
+ (package
+ (inherit rust-elf-0.7)
+ (name "rust-elf")
+ (version "0.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "elf" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ (arguments
+ `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))))
+
(define-public rust-emacs-0.19
(package
(name "rust-emacs")
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:52:04 GMT) (full text, mbox, link).
Message #23 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-boxxy-0.14): New variable
* gnu/packages/crates-io.scm (rust-boxxy-0.13): Fix build/skip failing
test
---
gnu/packages/crates-io.scm | 62 ++++++++++++++++++++++++++++++++------
1 file changed, 53 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb019434f3..b7f80c3560 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8929,8 +8929,56 @@ (define-public rust-boxfnonce-0.1
(description "This package provides a safe FnOnce boxing for Rust.")
(license license:expat)))
+(define-public rust-boxxy-0.14
+ (package
+ (name "rust-boxxy")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "boxxy" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18c57hzln2v1iwjq8a593814vil45jk48fhrf2grna6fc690cdkq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-base64" ,rust-base64-0.13)
+ ("rust-bufstream" ,rust-bufstream-0.1)
+ ("rust-caps" ,rust-caps-0.5)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-close-fds" ,rust-close-fds-0.3)
+ ("rust-errno" ,rust-errno-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libflate" ,rust-libflate-2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-pledge" ,rust-pledge-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-reqwest" ,rust-reqwest-0.12)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-rustyline" ,rust-rustyline-15)
+ ("rust-sha2" ,rust-sha2-0.10)
+ ("rust-tar" ,rust-tar-0.4)
+ ("rust-tokio" ,rust-tokio-1))
+ #:cargo-development-inputs (("rust-ctrlc" ,rust-ctrlc-3)
+ ("rust-elf" ,rust-elf-0.7)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-pem" ,rust-pem-3)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-sha2" ,rust-sha2-0.10))))
+ (home-page "https://github.com/kpcyrd/boxxy-rs")
+ (synopsis "Linkable sandbox explorer")
+ (description
+ "This library provides an interactive shell that can be linked into a
+program to verify sandboxing measures are adequate.")
+ (license license:lgpl3)))
+
(define-public rust-boxxy-0.13
(package
+ (inherit rust-boxxy-0.14)
(name "rust-boxxy")
(version "0.13.1")
(source
@@ -8940,9 +8988,11 @@ (define-public rust-boxxy-0.13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0rhzv4c6xn6va4dikbq2a2cmd5sa3svl13lhpcrchdn23y744aq0"))))
- (build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ `(#:cargo-test-flags '("--"
+ ;; Broken Doc Test
+ "--skip=src/ffi/unix.rs - ffi::unix::getgroups (line 41)")
+ #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.13)
("rust-bufstream" ,rust-bufstream-0.1)
("rust-caps" ,rust-caps-0.5)
@@ -8968,13 +9018,7 @@ (define-public rust-boxxy-0.13
("rust-env-logger" ,rust-env-logger-0.9)
("rust-pem" ,rust-pem-1)
("rust-rustls" ,rust-rustls-0.20)
- ("rust-sha2" ,rust-sha2-0.10))))
- (home-page "https://github.com/kpcyrd/boxxy-rs")
- (synopsis "Linkable sandbox explorer")
- (description
- "This library provides an interactive shell that can be linked into a
-program to verify sandboxing measures are adequate.")
- (license license:lgpl3)))
+ ("rust-sha2" ,rust-sha2-0.10))))))
(define-public rust-bracoxide-0.1
(package
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:53:01 GMT) (full text, mbox, link).
Message #26 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/build/cargo-build-system.scm (check): Add cargo required '--' if
cargo-test-string is `null`.
---
guix/build/cargo-build-system.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 5ef6b23abd..35d97a4d96 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2025 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2025 Aaron Covrig <aaron.covrig.us@ieee.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -272,6 +273,9 @@ (define* (check #:key
,@(if (member "--" cargo-test-flags)
'()
'("--"))
+ ,@(if (null? cargo-test-flags)
+ '("--")
+ '())
,@(if parallel-tests?
(list "--test-threads"
(number->string (parallel-job-count)))
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:53:02 GMT) (full text, mbox, link).
Message #29 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-check.scm (rust-criterion-0.4): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-check.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-check.scm b/gnu/packages/crates-check.scm
index 3d02f5421b..b652305a91 100644
--- a/gnu/packages/crates-check.scm
+++ b/gnu/packages/crates-check.scm
@@ -104,7 +104,12 @@ (define-public rust-criterion-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))))
+ "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(arguments
`(#:cargo-inputs
(("rust-anes" ,rust-anes-0.1)
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 16:53:02 GMT) (full text, mbox, link).
Message #32 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-futures-0.3): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-io.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b7f80c3560..26f4abf7b9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28440,7 +28440,12 @@ (define-public rust-futures-0.3
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))))
+ "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; use of undeclared crate or module `futures_test`
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:11:02 GMT) (full text, mbox, link).
Message #35 received at 76872@debbugs.gnu.org (full text, mbox, reply):
Updates the preceeding patch series to fix another package with the README in
a different location
Aaron Covrig (10):
gnu: rust-serde-test-0.9: Fix build
gnu: rust-rustyline-derive-0.11: New variable.
gnu: rust-rustyline-15: New variable.
gnu: rust-rustyline-14: New variable.
gnu: rust-elf-0.7: New variable
gnu: rust-boxxy-0.14: New variable.
gnu: cargo-build-system: check: Add required cargo test string if
null.
gnu: rust-criterion-0.4: Address 2024 Cargo deprecation/rename
warning.
gnu: rust-futures-0.3: Address 2024 Cargo deprecation/rename warning
gnu: rust-serde-codegen-internals-0.14: Fix build
gnu/packages/crates-check.scm | 7 +-
gnu/packages/crates-io.scm | 234 ++++++++++++++++++++++++++----
guix/build/cargo-build-system.scm | 4 +
3 files changed, 217 insertions(+), 28 deletions(-)
base-commit: a21bbfb712c0b82b76d6099b454c2a1db8dd9924
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:11:02 GMT) (full text, mbox, link).
Message #38 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-serde-test-0.9): Fix build by
updating dependencies path
---
gnu/packages/crates-io.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 717e4ce7c1..57710d45d8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71807,7 +71807,8 @@ (define-public rust-serde-test-0.9
(base32 "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf"))
(modules '((guix build utils)))
(snippet #~(substitute* "Cargo.toml"
- ((", path =.*}") "}")))))
+ ((", path =.*}") "}")
+ (("../README.md") "README.md")))))
(arguments
`(#:cargo-inputs (("rust-serde" ,rust-serde-0.9))))))
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:11:03 GMT) (full text, mbox, link).
Message #41 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-derive-0.11): New variable.
---
gnu/packages/crates-io.scm | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57710d45d8..f0b193f082 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68815,17 +68815,17 @@ (define-public rust-rustyline-6
("rust-rustyline-derive" ,rust-rustyline-derive-0.3)
("rust-tempfile" ,rust-tempfile-3))))))
-(define-public rust-rustyline-derive-0.10
+(define-public rust-rustyline-derive-0.11
(package
(name "rust-rustyline-derive")
- (version "0.10.0")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "rustyline-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (base32 "03cfnk753gfbxhp13dbcg9b0vksmxzkinksrpxgy5xvdbw3rszij"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -68836,6 +68836,23 @@ (define-public rust-rustyline-derive-0.10
(description "This package provides Rustyline macros implementation in Rust.")
(license license:expat)))
+(define-public rust-rustyline-derive-0.10
+ (package
+ (inherit rust-rustyline-derive-0.11)
+ (name "rust-rustyline-derive")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (arguments
+ `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))))))
+
(define-public rust-rustyline-derive-0.9
(package
(inherit rust-rustyline-derive-0.10)
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:11:03 GMT) (full text, mbox, link).
Message #44 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-15): New variable.
---
gnu/packages/crates-io.scm | 56 +++++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0b193f082..49ea57a60d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68617,8 +68617,56 @@ (define-public rust-rusty-fork-0.2
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2))))))
+(define-public rust-rustyline-15
+ (package
+ (name "rust-rustyline")
+ (version "15.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.32)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.11)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.2)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-winapi" ,rust-windows-sys-0.59))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/kkawakam/rustyline")
+ (synopsis "Readline implementation in Rust")
+ (description
+ "Rustyline is a readline implementation based on the linenoise package.")
+ (license license:expat)))
+
(define-public rust-rustyline-13
(package
+ (inherit rust-rustyline-15)
(name "rust-rustyline")
(version "13.0.0")
(source
@@ -68628,7 +68676,6 @@ (define-public rust-rustyline-13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11mywskk2jcxhanlsgzza5yx6ywpdlzr64qhbgpsx45clj1xd8h2"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags '("--release" "--"
"--skip=binding::test::size_of_event")
@@ -68656,12 +68703,7 @@ (define-public rust-rustyline-13
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-env-logger" ,rust-env-logger-0.10)
("rust-rand" ,rust-rand-0.8)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://github.com/kkawakam/rustyline")
- (synopsis "Readline implementation in Rust")
- (description
- "Rustyline is a readline implementation based on the linenoise package.")
- (license license:expat)))
+ ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-rustyline-12
(package
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:02 GMT) (full text, mbox, link).
Message #47 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-14): New variable.
---
gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 49ea57a60d..efc5d2a4d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68630,9 +68630,7 @@ (define-public rust-rustyline-15
(base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
(build-system cargo-build-system)
(arguments
- `(;#:cargo-test-flags '("--release" "--"
- ; "--skip=binding::test::size_of_event")
- #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
("rust-buffer-redux" ,rust-buffer-redux-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-clipboard-win" ,rust-clipboard-win-5)
@@ -68664,10 +68662,52 @@ (define-public rust-rustyline-15
"Rustyline is a readline implementation based on the linenoise package.")
(license license:expat)))
-(define-public rust-rustyline-13
+(define-public rust-rustyline-14
(package
(inherit rust-rustyline-15)
(name "rust-rustyline")
+ (version "14.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qvyckd5hbi2cf6kw4bsng6vb6rb9dzjfy24dndzszm3dn9yh0vq"))))
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.28)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.31)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.10)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-windows-sys" ,rust-windows-sys-0.52))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-rustyline-13
+ (package
+ (inherit rust-rustyline-14)
+ (name "rust-rustyline")
(version "13.0.0")
(source
(origin
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:02 GMT) (full text, mbox, link).
Message #50 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-elf-0.7): New variable
---
gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index efc5d2a4d6..eb019434f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22706,10 +22706,10 @@ (define-public rust-elain-0.3
(description "Set a type's minimum alignment with const generics.")
(license (list license:expat license:asl2.0))))
-(define-public rust-elf-0.0.10
+(define-public rust-elf-0.7
(package
(name "rust-elf")
- (version "0.0.10")
+ (version "0.7.4")
(source
(origin
(method url-fetch)
@@ -22718,16 +22718,43 @@ (define-public rust-elf-0.0.10
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ "0yyij25ps8mln1s1xzwggjr88gb2b35c8jf8az25dmfvfaar0ia4"))))
+ (arguments `(#:cargo-test-flags '("--"
+ ;; Missing test files
+ "--skip=elf_bytes::arch_tests"
+ "--skip=elf_bytes::interface_tests"
+ "--skip=elf_stream::arch_tests"
+ "--skip=elf_stream::interface_tests"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes (line 33)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_header_by_name (line 304)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_headers_with_strtab (line 219)"
+ "--skip=src/elf_stream.rs - elf_stream::ElfStream<E,S>::section_header_by_name (line 212)"
+ "--skip=src/lib.rs - (line 83)"
+ "--skip=src/note.rs - note (line 4)")))
(build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))
(home-page "https://github.com/cole14/rust-elf/")
(synopsis "Library for parsing ELF files")
(description
"This package provides a pure-Rust library for parsing ELF files.")
(license (list license:expat license:asl2.0))))
+(define-public rust-elf-0.0.10
+ (package
+ (inherit rust-elf-0.7)
+ (name "rust-elf")
+ (version "0.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "elf" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ (arguments
+ `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))))
+
(define-public rust-emacs-0.19
(package
(name "rust-emacs")
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:03 GMT) (full text, mbox, link).
Message #53 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-boxxy-0.14): New variable
* gnu/packages/crates-io.scm (rust-boxxy-0.13): Fix build/skip failing
test
---
gnu/packages/crates-io.scm | 62 ++++++++++++++++++++++++++++++++------
1 file changed, 53 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb019434f3..b7f80c3560 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8929,8 +8929,56 @@ (define-public rust-boxfnonce-0.1
(description "This package provides a safe FnOnce boxing for Rust.")
(license license:expat)))
+(define-public rust-boxxy-0.14
+ (package
+ (name "rust-boxxy")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "boxxy" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18c57hzln2v1iwjq8a593814vil45jk48fhrf2grna6fc690cdkq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-base64" ,rust-base64-0.13)
+ ("rust-bufstream" ,rust-bufstream-0.1)
+ ("rust-caps" ,rust-caps-0.5)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-close-fds" ,rust-close-fds-0.3)
+ ("rust-errno" ,rust-errno-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libflate" ,rust-libflate-2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-pledge" ,rust-pledge-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-reqwest" ,rust-reqwest-0.12)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-rustyline" ,rust-rustyline-15)
+ ("rust-sha2" ,rust-sha2-0.10)
+ ("rust-tar" ,rust-tar-0.4)
+ ("rust-tokio" ,rust-tokio-1))
+ #:cargo-development-inputs (("rust-ctrlc" ,rust-ctrlc-3)
+ ("rust-elf" ,rust-elf-0.7)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-pem" ,rust-pem-3)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-sha2" ,rust-sha2-0.10))))
+ (home-page "https://github.com/kpcyrd/boxxy-rs")
+ (synopsis "Linkable sandbox explorer")
+ (description
+ "This library provides an interactive shell that can be linked into a
+program to verify sandboxing measures are adequate.")
+ (license license:lgpl3)))
+
(define-public rust-boxxy-0.13
(package
+ (inherit rust-boxxy-0.14)
(name "rust-boxxy")
(version "0.13.1")
(source
@@ -8940,9 +8988,11 @@ (define-public rust-boxxy-0.13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0rhzv4c6xn6va4dikbq2a2cmd5sa3svl13lhpcrchdn23y744aq0"))))
- (build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ `(#:cargo-test-flags '("--"
+ ;; Broken Doc Test
+ "--skip=src/ffi/unix.rs - ffi::unix::getgroups (line 41)")
+ #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.13)
("rust-bufstream" ,rust-bufstream-0.1)
("rust-caps" ,rust-caps-0.5)
@@ -8968,13 +9018,7 @@ (define-public rust-boxxy-0.13
("rust-env-logger" ,rust-env-logger-0.9)
("rust-pem" ,rust-pem-1)
("rust-rustls" ,rust-rustls-0.20)
- ("rust-sha2" ,rust-sha2-0.10))))
- (home-page "https://github.com/kpcyrd/boxxy-rs")
- (synopsis "Linkable sandbox explorer")
- (description
- "This library provides an interactive shell that can be linked into a
-program to verify sandboxing measures are adequate.")
- (license license:lgpl3)))
+ ("rust-sha2" ,rust-sha2-0.10))))))
(define-public rust-bracoxide-0.1
(package
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:03 GMT) (full text, mbox, link).
Message #56 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/build/cargo-build-system.scm (check): Add cargo required '--' if
cargo-test-string is `null`.
---
guix/build/cargo-build-system.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 5ef6b23abd..35d97a4d96 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2025 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2025 Aaron Covrig <aaron.covrig.us@ieee.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -272,6 +273,9 @@ (define* (check #:key
,@(if (member "--" cargo-test-flags)
'()
'("--"))
+ ,@(if (null? cargo-test-flags)
+ '("--")
+ '())
,@(if parallel-tests?
(list "--test-threads"
(number->string (parallel-job-count)))
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:04 GMT) (full text, mbox, link).
Message #59 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-check.scm (rust-criterion-0.4): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-check.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-check.scm b/gnu/packages/crates-check.scm
index 3d02f5421b..b652305a91 100644
--- a/gnu/packages/crates-check.scm
+++ b/gnu/packages/crates-check.scm
@@ -104,7 +104,12 @@ (define-public rust-criterion-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))))
+ "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(arguments
`(#:cargo-inputs
(("rust-anes" ,rust-anes-0.1)
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:04 GMT) (full text, mbox, link).
Message #62 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-futures-0.3): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-io.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b7f80c3560..26f4abf7b9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28440,7 +28440,12 @@ (define-public rust-futures-0.3
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))))
+ "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; use of undeclared crate or module `futures_test`
--
2.48.1
Information forwarded
to divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Sat, 08 Mar 2025 17:12:05 GMT) (full text, mbox, link).
Message #65 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-serde-codegen-internals-0.14): Fix build by
updating dependencies path
---
gnu/packages/crates-io.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 26f4abf7b9..b42aaa18c4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71376,7 +71376,11 @@ (define-public rust-serde-codegen-internals-0.14
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0004s3wlc85vi6hq62hq84cv5b6qbbin1n6hdaqj095xhg98p25w"))))
+ "0004s3wlc85vi6hq62hq84cv5b6qbbin1n6hdaqj095xhg98p25w"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ;; Update to address Cargo checking readme location
+ (("../README.md") "README.md")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-syn" ,rust-syn-0.11))))
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:43:02 GMT) (full text, mbox, link).
Message #68 received at 76872@debbugs.gnu.org (full text, mbox, reply):
It seems the I accidently put a 'y' response down as the character set
in the previous patch submission... This should rectify that
Aaron Covrig (10):
gnu: rust-serde-test-0.9: Fix build
gnu: rust-rustyline-derive-0.11: New variable.
gnu: rust-rustyline-15: New variable.
gnu: rust-rustyline-14: New variable.
gnu: rust-elf-0.7: New variable
gnu: rust-boxxy-0.14: New variable.
gnu: cargo-build-system: check: Add required cargo test string if
null.
gnu: rust-criterion-0.4: Address 2024 Cargo deprecation/rename
warning.
gnu: rust-futures-0.3: Address 2024 Cargo deprecation/rename warning
gnu: rust-serde-codegen-internals-0.14: Fix build
gnu/packages/crates-check.scm | 7 +-
gnu/packages/crates-io.scm | 234 ++++++++++++++++++++++++++----
guix/build/cargo-build-system.scm | 4 +
3 files changed, 217 insertions(+), 28 deletions(-)
base-commit: b54a9ca849f013300c633fb79d80bc754f6b28a2
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:43:02 GMT) (full text, mbox, link).
Message #71 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-serde-test-0.9): Fix build by
updating dependencies path
---
gnu/packages/crates-io.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f3cdb624a6..4252c3d418 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71928,7 +71928,8 @@ (define-public rust-serde-test-0.9
(base32 "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf"))
(modules '((guix build utils)))
(snippet #~(substitute* "Cargo.toml"
- ((", path =.*}") "}")))))
+ ((", path =.*}") "}")
+ (("../README.md") "README.md")))))
(arguments
`(#:cargo-inputs (("rust-serde" ,rust-serde-0.9))))))
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:43:02 GMT) (full text, mbox, link).
Message #74 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-derive-0.11): New variable.
---
gnu/packages/crates-io.scm | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4252c3d418..898de47b6f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68936,17 +68936,17 @@ (define-public rust-rustyline-6
("rust-rustyline-derive" ,rust-rustyline-derive-0.3)
("rust-tempfile" ,rust-tempfile-3))))))
-(define-public rust-rustyline-derive-0.10
+(define-public rust-rustyline-derive-0.11
(package
(name "rust-rustyline-derive")
- (version "0.10.0")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "rustyline-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (base32 "03cfnk753gfbxhp13dbcg9b0vksmxzkinksrpxgy5xvdbw3rszij"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -68957,6 +68957,23 @@ (define-public rust-rustyline-derive-0.10
(description "This package provides Rustyline macros implementation in Rust.")
(license license:expat)))
+(define-public rust-rustyline-derive-0.10
+ (package
+ (inherit rust-rustyline-derive-0.11)
+ (name "rust-rustyline-derive")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5"))))
+ (arguments
+ `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))))))
+
(define-public rust-rustyline-derive-0.9
(package
(inherit rust-rustyline-derive-0.10)
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:02 GMT) (full text, mbox, link).
Message #77 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-15): New variable.
---
gnu/packages/crates-io.scm | 56 +++++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 898de47b6f..172c2d06df 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68738,8 +68738,56 @@ (define-public rust-rusty-fork-0.2
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2))))))
+(define-public rust-rustyline-15
+ (package
+ (name "rust-rustyline")
+ (version "15.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.32)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.11)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.2)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-winapi" ,rust-windows-sys-0.59))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/kkawakam/rustyline")
+ (synopsis "Readline implementation in Rust")
+ (description
+ "Rustyline is a readline implementation based on the linenoise package.")
+ (license license:expat)))
+
(define-public rust-rustyline-13
(package
+ (inherit rust-rustyline-15)
(name "rust-rustyline")
(version "13.0.0")
(source
@@ -68749,7 +68797,6 @@ (define-public rust-rustyline-13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11mywskk2jcxhanlsgzza5yx6ywpdlzr64qhbgpsx45clj1xd8h2"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-test-flags '("--release" "--"
"--skip=binding::test::size_of_event")
@@ -68777,12 +68824,7 @@ (define-public rust-rustyline-13
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-env-logger" ,rust-env-logger-0.10)
("rust-rand" ,rust-rand-0.8)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://github.com/kkawakam/rustyline")
- (synopsis "Readline implementation in Rust")
- (description
- "Rustyline is a readline implementation based on the linenoise package.")
- (license license:expat)))
+ ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-rustyline-12
(package
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:03 GMT) (full text, mbox, link).
Message #80 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-rustyline-14): New variable.
---
gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 172c2d06df..c45418c159 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68751,9 +68751,7 @@ (define-public rust-rustyline-15
(base32 "0bws18zrj8i6ix27k9bhb3mb1civbz5nr72rv8xm2bljvikf1q9f"))))
(build-system cargo-build-system)
(arguments
- `(;#:cargo-test-flags '("--release" "--"
- ; "--skip=binding::test::size_of_event")
- #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
("rust-buffer-redux" ,rust-buffer-redux-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-clipboard-win" ,rust-clipboard-win-5)
@@ -68785,10 +68783,52 @@ (define-public rust-rustyline-15
"Rustyline is a readline implementation based on the linenoise package.")
(license license:expat)))
-(define-public rust-rustyline-13
+(define-public rust-rustyline-14
(package
(inherit rust-rustyline-15)
(name "rust-rustyline")
+ (version "14.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qvyckd5hbi2cf6kw4bsng6vb6rb9dzjfy24dndzszm3dn9yh0vq"))))
+ (arguments
+ `(;#:cargo-test-flags '("--release" "--"
+ ; "--skip=binding::test::size_of_event")
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+ ("rust-buffer-redux" ,rust-buffer-redux-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clipboard-win" ,rust-clipboard-win-5)
+ ("rust-fd-lock" ,rust-fd-lock-4)
+ ("rust-home" ,rust-home-0.5)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.28)
+ ("rust-radix-trie" ,rust-radix-trie-0.2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rusqlite" ,rust-rusqlite-0.31)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.10)
+ ("rust-signal-hook" ,rust-signal-hook-0.3)
+ ("rust-skim" ,rust-skim-0.10)
+ ("rust-termios" ,rust-termios-0.3)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-windows-sys" ,rust-windows-sys-0.52))
+ #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-rustyline-13
+ (package
+ (inherit rust-rustyline-14)
+ (name "rust-rustyline")
(version "13.0.0")
(source
(origin
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:03 GMT) (full text, mbox, link).
Message #83 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-elf-0.7): New variable
---
gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c45418c159..83bfa38a45 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22706,10 +22706,10 @@ (define-public rust-elain-0.3
(description "Set a type's minimum alignment with const generics.")
(license (list license:expat license:asl2.0))))
-(define-public rust-elf-0.0.10
+(define-public rust-elf-0.7
(package
(name "rust-elf")
- (version "0.0.10")
+ (version "0.7.4")
(source
(origin
(method url-fetch)
@@ -22718,16 +22718,43 @@ (define-public rust-elf-0.0.10
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ "0yyij25ps8mln1s1xzwggjr88gb2b35c8jf8az25dmfvfaar0ia4"))))
+ (arguments `(#:cargo-test-flags '("--"
+ ;; Missing test files
+ "--skip=elf_bytes::arch_tests"
+ "--skip=elf_bytes::interface_tests"
+ "--skip=elf_stream::arch_tests"
+ "--skip=elf_stream::interface_tests"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes (line 33)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_header_by_name (line 304)"
+ "--skip=src/elf_bytes.rs - elf_bytes::ElfBytes<'data,E>::section_headers_with_strtab (line 219)"
+ "--skip=src/elf_stream.rs - elf_stream::ElfStream<E,S>::section_header_by_name (line 212)"
+ "--skip=src/lib.rs - (line 83)"
+ "--skip=src/note.rs - note (line 4)")))
(build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))
(home-page "https://github.com/cole14/rust-elf/")
(synopsis "Library for parsing ELF files")
(description
"This package provides a pure-Rust library for parsing ELF files.")
(license (list license:expat license:asl2.0))))
+(define-public rust-elf-0.0.10
+ (package
+ (inherit rust-elf-0.7)
+ (name "rust-elf")
+ (version "0.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "elf" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xcpf7jdmrl7rdmd6009grahvgp3k695h5x4cadrpr70vcaxwha8"))))
+ (arguments
+ `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-0.5))))))
+
(define-public rust-emacs-0.19
(package
(name "rust-emacs")
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:04 GMT) (full text, mbox, link).
Message #86 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-boxxy-0.14): New variable
* gnu/packages/crates-io.scm (rust-boxxy-0.13): Fix build/skip failing
test
---
gnu/packages/crates-io.scm | 62 ++++++++++++++++++++++++++++++++------
1 file changed, 53 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 83bfa38a45..76333a28bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8929,8 +8929,56 @@ (define-public rust-boxfnonce-0.1
(description "This package provides a safe FnOnce boxing for Rust.")
(license license:expat)))
+(define-public rust-boxxy-0.14
+ (package
+ (name "rust-boxxy")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "boxxy" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18c57hzln2v1iwjq8a593814vil45jk48fhrf2grna6fc690cdkq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-base64" ,rust-base64-0.13)
+ ("rust-bufstream" ,rust-bufstream-0.1)
+ ("rust-caps" ,rust-caps-0.5)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-close-fds" ,rust-close-fds-0.3)
+ ("rust-errno" ,rust-errno-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libflate" ,rust-libflate-2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-pledge" ,rust-pledge-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-reqwest" ,rust-reqwest-0.12)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-rustyline" ,rust-rustyline-15)
+ ("rust-sha2" ,rust-sha2-0.10)
+ ("rust-tar" ,rust-tar-0.4)
+ ("rust-tokio" ,rust-tokio-1))
+ #:cargo-development-inputs (("rust-ctrlc" ,rust-ctrlc-3)
+ ("rust-elf" ,rust-elf-0.7)
+ ("rust-env-logger" ,rust-env-logger-0.11)
+ ("rust-pem" ,rust-pem-3)
+ ("rust-rustls" ,rust-rustls-0.20)
+ ("rust-sha2" ,rust-sha2-0.10))))
+ (home-page "https://github.com/kpcyrd/boxxy-rs")
+ (synopsis "Linkable sandbox explorer")
+ (description
+ "This library provides an interactive shell that can be linked into a
+program to verify sandboxing measures are adequate.")
+ (license license:lgpl3)))
+
(define-public rust-boxxy-0.13
(package
+ (inherit rust-boxxy-0.14)
(name "rust-boxxy")
(version "0.13.1")
(source
@@ -8940,9 +8988,11 @@ (define-public rust-boxxy-0.13
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0rhzv4c6xn6va4dikbq2a2cmd5sa3svl13lhpcrchdn23y744aq0"))))
- (build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+ `(#:cargo-test-flags '("--"
+ ;; Broken Doc Test
+ "--skip=src/ffi/unix.rs - ffi::unix::getgroups (line 41)")
+ #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.13)
("rust-bufstream" ,rust-bufstream-0.1)
("rust-caps" ,rust-caps-0.5)
@@ -8968,13 +9018,7 @@ (define-public rust-boxxy-0.13
("rust-env-logger" ,rust-env-logger-0.9)
("rust-pem" ,rust-pem-1)
("rust-rustls" ,rust-rustls-0.20)
- ("rust-sha2" ,rust-sha2-0.10))))
- (home-page "https://github.com/kpcyrd/boxxy-rs")
- (synopsis "Linkable sandbox explorer")
- (description
- "This library provides an interactive shell that can be linked into a
-program to verify sandboxing measures are adequate.")
- (license license:lgpl3)))
+ ("rust-sha2" ,rust-sha2-0.10))))))
(define-public rust-bracoxide-0.1
(package
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:04 GMT) (full text, mbox, link).
Message #89 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/build/cargo-build-system.scm (check): Add cargo required '--' if
cargo-test-string is `null`.
---
guix/build/cargo-build-system.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 5ef6b23abd..35d97a4d96 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2025 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2025 Aaron Covrig <aaron.covrig.us@ieee.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -272,6 +273,9 @@ (define* (check #:key
,@(if (member "--" cargo-test-flags)
'()
'("--"))
+ ,@(if (null? cargo-test-flags)
+ '("--")
+ '())
,@(if parallel-tests?
(list "--test-threads"
(number->string (parallel-job-count)))
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:05 GMT) (full text, mbox, link).
Message #92 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-check.scm (rust-criterion-0.4): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-check.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-check.scm b/gnu/packages/crates-check.scm
index 3d02f5421b..b652305a91 100644
--- a/gnu/packages/crates-check.scm
+++ b/gnu/packages/crates-check.scm
@@ -104,7 +104,12 @@ (define-public rust-criterion-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))))
+ "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(arguments
`(#:cargo-inputs
(("rust-anes" ,rust-anes-0.1)
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:05 GMT) (full text, mbox, link).
Message #95 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-futures-0.3): Address 2024 Cargo
deprecation/rename warning for `default_features`
---
gnu/packages/crates-io.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 76333a28bd..e901cad6a3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28440,7 +28440,12 @@ (define-public rust-futures-0.3
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))))
+ "0xh8ddbkm9jy8kc5gbvjp9a4b6rqqxvc8471yb2qaz5wm2qhgg35"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (substitute* "Cargo.toml"
+ ;; Address 2024 deprecation/rename warning
+ (("default_features") "default-features"))))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; use of undeclared crate or module `futures_test`
--
2.48.1
Information forwarded
to guix-patches@gnu.org:
bug#76872; Package guix-patches.
(Wed, 19 Mar 2025 23:44:06 GMT) (full text, mbox, link).
Message #98 received at 76872@debbugs.gnu.org (full text, mbox, reply):
* gnu/packages/crates-io.scm (rust-serde-codegen-internals-0.14): Fix build by
updating dependencies path
---
gnu/packages/crates-io.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e901cad6a3..5eac1385e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71497,7 +71497,11 @@ (define-public rust-serde-codegen-internals-0.14
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0004s3wlc85vi6hq62hq84cv5b6qbbin1n6hdaqj095xhg98p25w"))))
+ "0004s3wlc85vi6hq62hq84cv5b6qbbin1n6hdaqj095xhg98p25w"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ;; Update to address Cargo checking readme location
+ (("../README.md") "README.md")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-syn" ,rust-syn-0.11))))
--
2.48.1
Send a report that this bug log contains spam.
Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.
Copyright © 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson, 2005-2017 Don Armstrong, and many other contributors.