GNU bug report logs -
#75206
[PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet.
Previous Next
Reported by: Herman Rimm <herman <at> rimm.ee>
Date: Mon, 30 Dec 2024 17:54:02 UTC
Severity: normal
Tags: patch
Done: Steve George <steve <at> futurile.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75206 in the body.
You can then email your comments to 75206 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 17:54:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Herman Rimm <herman <at> rimm.ee>
:
New bug report received and forwarded. Copy sent to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
.
(Mon, 30 Dec 2024 17:54:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-structopt-0.3): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c
---
gnu/packages/crates-io.scm | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b38709201d..4034345fcf5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79155,11 +79155,15 @@ (define-public rust-structopt-0.3
(origin
(method url-fetch)
(uri (crate-uri "structopt" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
+ (base32 "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin (substitute* "Cargo.toml"
+ ;; feature does not exist
+ (("lints.*") "")
+ (("2.33") #$(package-version rust-clap-2)))))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -79171,15 +79175,7 @@ (define-public rust-structopt-0.3
#:cargo-development-inputs
(("rust-strum" ,rust-strum-0.21)
("rust-trybuild" ,rust-trybuild-1)
- ("rust-rustversion" ,rust-rustversion-1))
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ;; feature does not exist
- (("lints.*") "")
- (("2.33") ,(package-version rust-clap-2))))))))
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page "https://github.com/TeXitoi/structopt")
(synopsis "Parse command line argument by defining a struct")
(description
base-commit: 4d478f0b404a86a0849722536f11fde0b1857bb8
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 17:59:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-structopt-0.3): Do not skip build.
[source]: Remove failing test files.
Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c
---
gnu/packages/crates-io.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4034345fcf5..efc782d2b79 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79163,11 +79163,17 @@ (define-public rust-structopt-0.3
#~(begin (substitute* "Cargo.toml"
;; feature does not exist
(("lints.*") "")
- (("2.33") #$(package-version rust-clap-2)))))))
+ (("2.33") #$(package-version rust-clap-2)))
+ ;; Cargo build stderr does not exactly match.
+ (with-directory-excursion "tests/ui"
+ (for-each delete-file
+ '("external_subcommand_wrong_type.rs"
+ "positional_bool.rs"
+ "raw.rs"
+ "skip_without_default.rs")))))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-structopt-derive" ,rust-structopt-derive-0.4)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-paw" ,rust-paw-1)
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 17:59:03 GMT)
Full text and
rfc822 format available.
Message #11 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-syn-2): Add snippet.
[arguments]: Remove patch-test-suite phase.
Change-Id: I1f53f9259fc9b11ac420aed3238671b3c20b236d
---
gnu/packages/crates-io.scm | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index efc782d2b79..e66d2fa7626 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80650,26 +80650,25 @@ (define-public rust-syn-2
(package
(name "rust-syn")
(version "2.0.90")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "syn" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "syn" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))
+ (modules '((guix build utils)))
+ ;; The syn-test-suite crate is empty.
+ (snippet
+ #~(substitute* "Cargo.toml"
+ (("^\\[dev-dependencies.syn-test-suite\\]") "")
+ (("^version = \"0\"") "")
+ (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
(build-system cargo-build-system)
(arguments
;; Tests fail to compile
;; error[E0463]: can't find crate for `rustc_ast` (among other errors).
`(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; The syn-test-suite crate is empty.
- (add-after 'unpack 'patch-test-suite
- (lambda _
- (substitute* "Cargo.toml"
- (("^\\[dev-dependencies.syn-test-suite\\]") "")
- (("^version = \"0\"") "")
- (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-syn-1): Inherit rust-syn-2.
[arguments]: Remove patch-test-suite phase.
Change-Id: I37bcd0cbb07d03fecdd17b96dd0ce7023a6adc06
---
gnu/packages/crates-io.scm | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e66d2fa7626..62c3ec1fc58 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80697,28 +80697,19 @@ (define-public rust-syn-2
(define-public rust-syn-1
(package
+ (inherit rust-syn-2)
(name "rust-syn")
(version "1.0.109")
(source
(origin
- (method url-fetch)
+ (inherit (package-source rust-syn-2))
(uri (crate-uri "syn" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj"))))
- (build-system cargo-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; The syn-test-suite crate is empty.
- (add-after 'unpack 'patch-test-suite
- (lambda _
- (substitute* "Cargo.toml"
- (("^\\[dev-dependencies.syn-test-suite\\]") "")
- (("^version = \"0\"") "")
- (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
- ;; Tests fail to compile
+ `(;; Tests fail to compile
;; error[E0432]: unresolved imports `syn::Item`, `syn::Pat`
#:tests? #false
#:cargo-inputs
@@ -80736,15 +80727,7 @@ (define-public rust-syn-1
("rust-reqwest" ,rust-reqwest-0.11)
("rust-tar" ,rust-tar-0.4)
("rust-termcolor" ,rust-termcolor-1)
- ("rust-walkdir" ,rust-walkdir-2))))
- (inputs (list openssl))
- (native-inputs (list pkg-config))
- (home-page "https://github.com/dtolnay/syn")
- (synopsis "Parser for Rust source code")
- (description
- "Syn is a parsing library for parsing a stream of Rust tokens into
-a syntax tree of Rust source code.")
- (license (list license:expat license:asl2.0))))
+ ("rust-walkdir" ,rust-walkdir-2))))))
(define-public rust-syn-0.15
(package
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:04 GMT)
Full text and
rfc822 format available.
Message #17 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-syn-0.11): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: Ied5346ef86d4d1404d12b757c3213a18607a1a44
---
gnu/packages/crates-io.scm | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 62c3ec1fc58..259ae00034e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80815,19 +80815,14 @@ (define-public rust-syn-0.11
(origin
(method url-fetch)
(uri (crate-uri "syn" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))))
+ (base32 "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ((", path =.*,") ",")))))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ((", path =.*,") ",")))))
- #:tests? #f ; Tests don't compile correctly.
+ `(#:tests? #f ; Tests don't compile correctly.
#:cargo-inputs
(("rust-quote" ,rust-quote-0.3)
("rust-synom" ,rust-synom-0.11)
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:04 GMT)
Full text and
rfc822 format available.
Message #20 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-synom-0.11): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe
---
gnu/packages/crates-io.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 259ae00034e..5a573642353 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80946,21 +80946,15 @@ (define-public rust-synom-0.11
(origin
(method url-fetch)
(uri (crate-uri "synom" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))))
+ (base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ (("^path =.*") "")))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; doc tests fail
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- (("^path =.*") ""))
- #t)))
#:cargo-inputs
(("rust-unicode-xid" ,rust-unicode-xid-0.0.4))
#:cargo-development-inputs
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:05 GMT)
Full text and
rfc822 format available.
Message #23 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-synom-0.11): Fix readme path.
Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe
---
gnu/packages/crates-io.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5a573642353..aa5ce6f5087 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80951,6 +80951,7 @@ (define-public rust-synom-0.11
(base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))
(modules '((guix build utils)))
(snippet #~(substitute* "Cargo.toml"
+ (("\\.\\./README.md") "README.md")
(("^path =.*") "")))))
(build-system cargo-build-system)
(arguments
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:06 GMT)
Full text and
rfc822 format available.
Message #26 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-io.scm (rust-uint-0.9): Add snippet.
[arguments]: Remove adjust-cargo-toml phase.
Change-Id: I9ff08abe419e860e4cb77b94b401466e2e113cc3
---
gnu/packages/crates-io.scm | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa5ce6f5087..bb89ad6e2c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90529,12 +90529,15 @@ (define-public rust-uint-0.9
(name "rust-uint")
(version "0.9.5")
(source
- (origin
- (method url-fetch)
- (uri (crate-uri "uint" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn"))))
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "uint" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ (("integer") "default")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -90547,13 +90550,7 @@ (define-public rust-uint-0.9
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.4)
("rust-num-bigint" ,rust-num-bigint-0.4)
- ("rust-rug" ,rust-rug-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'adjust-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- (("integer") "default")))))))
+ ("rust-rug" ,rust-rug-1))))
(inputs
(list gmp mpc mpfr))
(home-page "https://parity.io")
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:06 GMT)
Full text and
rfc822 format available.
Message #29 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-tls.scm (rust-rustls-ffi-0.8): Add snippet.
[arguments]: Remove adjust-cbindgen-requirement phase.
Change-Id: Ia7434a8a6e46425e331c19a510846c78074fd46a
---
gnu/packages/crates-tls.scm | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 36737998a9c..f66445487f8 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1675,12 +1675,18 @@ (define-public rust-rustls-ffi-0.8
(inherit rust-rustls-ffi-0.14)
(name "rust-rustls-ffi")
(version "0.8.2")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "rustls-ffi" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustls-ffi" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx"))
+ (modules '((guix build utils)))
+ ;; The Cargo.toml in the git repository doesn't specify a version
+ ;; requirement for cbindgen.
+ (snippet #~(substitute* "Cargo.toml"
+ (("0\\.19\\.0") "*")))))
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
@@ -1691,15 +1697,7 @@ (define-public rust-rustls-ffi-0.8
("rust-sct" ,rust-sct-0.7)
("rust-webpki" ,rust-webpki-0.22))
#:cargo-development-inputs
- (("rust-cbindgen" ,rust-cbindgen-0.26))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'adjust-cbindgen-requirement
- ;; The Cargo.toml in the git repository doesn't specify
- ;; a version requirement for cbindgen.
- (lambda _
- (substitute* "Cargo.toml"
- (("0\\.19\\.0") "*")))))))))
+ (("rust-cbindgen" ,rust-cbindgen-0.26))))))
(define-public rust-rustls-native-certs-0.8
(package
--
2.45.2
Information forwarded
to
efraim <at> flashner.co.il, guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 30 Dec 2024 18:00:07 GMT)
Full text and
rfc822 format available.
Message #32 received at 75206 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/crates-windows.scm (rust-user32-sys-0.2): Add snippet.
[arguments]: Remove fix-cargo-toml phase.
Change-Id: I4316d89719ba1837c87729aae4b38be9d2bad3d9
---
gnu/packages/crates-windows.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 90eb31544d8..2d1818c7d9b 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -928,17 +928,15 @@ (define-public rust-user32-sys-0.2
(uri (crate-uri "user32-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))))
+ (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ((", path =.*}") "}")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.2))
- #:cargo-development-inputs (("rust-winapi-build" ,rust-winapi-build-0.1))
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ((", path =.*}")
- "}")) #t)))))
+ #:cargo-development-inputs
+ (("rust-winapi-build" ,rust-winapi-build-0.1))))
(home-page "https://github.com/retep998/winapi-rs")
(synopsis "Function definitions for the Windows API library user32")
(description
--
2.45.2
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:50:01 GMT)
Full text and
rfc822 format available.
Message #35 received at 75206 <at> debbugs.gnu.org (full text, mbox):
Thank you for your contribution Herman, I went ahead and re-based
these patches against the latest branch commit and dropped patch #8 for
rust-rustls-ffi-0.8 as it was removed from the rust-team branch.
Herman Rimm (9):
gnu: rust-structopt-0.3: Use snippet.
gnu: rust-structopt-0.3: Build.
gnu: rust-syn-2: Use snippet.
gnu: rust-syn-1: Inherit rust-syn-2.
gnu: rust-syn-0.11: Use snippet.
gnu: rust-synom-0.11: Use snippet.
gnu: rust-synom-0.11: Fix build.
gnu: rust-uint-0.9: Use snippet.
gnu: rust-user32-sys-0.2: Use snippet.
gnu/packages/crates-io.scm | 160 +++++++++++++-------------------
gnu/packages/crates-windows.scm | 14 ++-
2 files changed, 71 insertions(+), 103 deletions(-)
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:50:02 GMT)
Full text and
rfc822 format available.
Message #38 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-structopt-0.3): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c
---
gnu/packages/crates-io.scm | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e769de7723..49b1a9b420 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76106,11 +76106,15 @@ (define-public rust-structopt-0.3
(origin
(method url-fetch)
(uri (crate-uri "structopt" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
+ (base32 "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin (substitute* "Cargo.toml"
+ ;; feature does not exist
+ (("lints.*") "")
+ (("2.33") #$(package-version rust-clap-2)))))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -76122,15 +76126,7 @@ (define-public rust-structopt-0.3
#:cargo-development-inputs
(("rust-strum" ,rust-strum-0.21)
("rust-trybuild" ,rust-trybuild-1)
- ("rust-rustversion" ,rust-rustversion-1))
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ;; feature does not exist
- (("lints.*") "")
- (("2.33") ,(package-version rust-clap-2))))))))
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page "https://github.com/TeXitoi/structopt")
(synopsis "Parse command line argument by defining a struct")
(description
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:50:03 GMT)
Full text and
rfc822 format available.
Message #41 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-structopt-0.3): Do not skip build.
[source]: Remove failing test files.
Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c
---
gnu/packages/crates-io.scm | 39 +++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 49b1a9b420..5705720f63 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76110,23 +76110,28 @@ (define-public rust-structopt-0.3
(sha256
(base32 "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))
(modules '((guix build utils)))
- (snippet
- #~(begin (substitute* "Cargo.toml"
- ;; feature does not exist
- (("lints.*") "")
- (("2.33") #$(package-version rust-clap-2)))))))
- (build-system cargo-build-system)
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-structopt-derive" ,rust-structopt-derive-0.4)
- ("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-paw" ,rust-paw-1)
- ("rust-clap" ,rust-clap-2))
- #:cargo-development-inputs
- (("rust-strum" ,rust-strum-0.21)
- ("rust-trybuild" ,rust-trybuild-1)
- ("rust-rustversion" ,rust-rustversion-1))))
+ (snippet #~(begin
+ (substitute* "Cargo.toml"
+ ;; feature does not exist
+ (("lints.*")
+ "")
+ (("2.33")
+ #$(package-version rust-clap-2)))
+ ;; Cargo build stderr does not exactly match.
+ (with-directory-excursion "tests/ui"
+ (for-each delete-file
+ '("external_subcommand_wrong_type.rs"
+ "positional_bool.rs" "raw.rs"
+ "skip_without_default.rs")))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-structopt-derive" ,rust-structopt-derive-0.4)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-paw" ,rust-paw-1)
+ ("rust-clap" ,rust-clap-2))
+ #:cargo-development-inputs (("rust-strum" ,rust-strum-0.21)
+ ("rust-trybuild" ,rust-trybuild-1)
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page "https://github.com/TeXitoi/structopt")
(synopsis "Parse command line argument by defining a struct")
(description
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:50:03 GMT)
Full text and
rfc822 format available.
Message #44 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-syn-2): Add snippet.
[arguments]: Remove patch-test-suite phase.
Change-Id: I1f53f9259fc9b11ac420aed3238671b3c20b236d
---
gnu/packages/crates-io.scm | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5705720f63..c4953f7e6c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77442,26 +77442,25 @@ (define-public rust-syn-2
(package
(name "rust-syn")
(version "2.0.90")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "syn" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "syn" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))
+ (modules '((guix build utils)))
+ ;; The syn-test-suite crate is empty.
+ (snippet
+ #~(substitute* "Cargo.toml"
+ (("^\\[dev-dependencies.syn-test-suite\\]") "")
+ (("^version = \"0\"") "")
+ (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
(build-system cargo-build-system)
(arguments
;; Tests fail to compile
;; error[E0463]: can't find crate for `rustc_ast` (among other errors).
`(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; The syn-test-suite crate is empty.
- (add-after 'unpack 'patch-test-suite
- (lambda _
- (substitute* "Cargo.toml"
- (("^\\[dev-dependencies.syn-test-suite\\]") "")
- (("^version = \"0\"") "")
- (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:01 GMT)
Full text and
rfc822 format available.
Message #47 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-syn-1): Inherit rust-syn-2.
[arguments]: Remove patch-test-suite phase.
Change-Id: I37bcd0cbb07d03fecdd17b96dd0ce7023a6adc06
---
gnu/packages/crates-io.scm | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c4953f7e6c..666f28b3cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77489,28 +77489,19 @@ (define-public rust-syn-2
(define-public rust-syn-1
(package
+ (inherit rust-syn-2)
(name "rust-syn")
(version "1.0.109")
(source
(origin
- (method url-fetch)
+ (inherit (package-source rust-syn-2))
(uri (crate-uri "syn" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj"))))
- (build-system cargo-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; The syn-test-suite crate is empty.
- (add-after 'unpack 'patch-test-suite
- (lambda _
- (substitute* "Cargo.toml"
- (("^\\[dev-dependencies.syn-test-suite\\]") "")
- (("^version = \"0\"") "")
- (("^test = \\[\"syn-test-suite/all-features\"\\]") "")))))
- ;; Tests fail to compile
+ `(;; Tests fail to compile
;; error[E0432]: unresolved imports `syn::Item`, `syn::Pat`
#:tests? #false
#:cargo-inputs
@@ -77528,15 +77519,7 @@ (define-public rust-syn-1
("rust-reqwest" ,rust-reqwest-0.11)
("rust-tar" ,rust-tar-0.4)
("rust-termcolor" ,rust-termcolor-1)
- ("rust-walkdir" ,rust-walkdir-2))))
- (inputs (list openssl))
- (native-inputs (list pkg-config))
- (home-page "https://github.com/dtolnay/syn")
- (synopsis "Parser for Rust source code")
- (description
- "Syn is a parsing library for parsing a stream of Rust tokens into
-a syntax tree of Rust source code.")
- (license (list license:expat license:asl2.0))))
+ ("rust-walkdir" ,rust-walkdir-2))))))
(define-public rust-syn-0.15
(package
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:02 GMT)
Full text and
rfc822 format available.
Message #50 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-syn-0.11): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: Ied5346ef86d4d1404d12b757c3213a18607a1a44
---
gnu/packages/crates-io.scm | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 666f28b3cb..3185f06044 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77583,19 +77583,14 @@ (define-public rust-syn-0.11
(origin
(method url-fetch)
(uri (crate-uri "syn" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))))
+ (base32 "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ((", path =.*,") ",")))))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ((", path =.*,") ",")))))
- #:tests? #f ; Tests don't compile correctly.
+ `(#:tests? #f ; Tests don't compile correctly.
#:cargo-inputs
(("rust-quote" ,rust-quote-0.3)
("rust-synom" ,rust-synom-0.11)
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:02 GMT)
Full text and
rfc822 format available.
Message #53 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-synom-0.11): Add snippet.
[arguments]: Remove fixup-cargo-toml phase.
Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe
---
gnu/packages/crates-io.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3185f06044..1b2adbd875 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77714,21 +77714,15 @@ (define-public rust-synom-0.11
(origin
(method url-fetch)
(uri (crate-uri "synom" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))))
+ (base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ (("^path =.*") "")))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; doc tests fail
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fixup-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- (("^path =.*") ""))
- #t)))
#:cargo-inputs
(("rust-unicode-xid" ,rust-unicode-xid-0.0.4))
#:cargo-development-inputs
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:03 GMT)
Full text and
rfc822 format available.
Message #56 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-synom-0.11): Fix readme path.
Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe
---
gnu/packages/crates-io.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b2adbd875..6c274d31e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77719,6 +77719,7 @@ (define-public rust-synom-0.11
(base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))
(modules '((guix build utils)))
(snippet #~(substitute* "Cargo.toml"
+ (("\\.\\./README.md") "README.md")
(("^path =.*") "")))))
(build-system cargo-build-system)
(arguments
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:04 GMT)
Full text and
rfc822 format available.
Message #59 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-io.scm (rust-uint-0.9): Add snippet.
[arguments]: Remove adjust-cargo-toml phase.
Change-Id: I9ff08abe419e860e4cb77b94b401466e2e113cc3
---
gnu/packages/crates-io.scm | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6c274d31e2..273002151a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -87267,12 +87267,15 @@ (define-public rust-uint-0.9
(name "rust-uint")
(version "0.9.5")
(source
- (origin
- (method url-fetch)
- (uri (crate-uri "uint" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn"))))
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "uint" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ (("integer") "default")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -87285,13 +87288,7 @@ (define-public rust-uint-0.9
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.4)
("rust-num-bigint" ,rust-num-bigint-0.4)
- ("rust-rug" ,rust-rug-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'adjust-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- (("integer") "default")))))))
+ ("rust-rug" ,rust-rug-1))))
(inputs
(list gmp mpc mpfr))
(home-page "https://parity.io")
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#75206
; Package
guix-patches
.
(Mon, 20 Jan 2025 02:51:04 GMT)
Full text and
rfc822 format available.
Message #62 received at 75206 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee>
* gnu/packages/crates-windows.scm (rust-user32-sys-0.2): Add snippet.
[arguments]: Remove fix-cargo-toml phase.
Change-Id: I4316d89719ba1837c87729aae4b38be9d2bad3d9
---
gnu/packages/crates-windows.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 2f212190dd..701b8bd9f2 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -911,17 +911,15 @@ (define-public rust-user32-sys-0.2
(uri (crate-uri "user32-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))))
+ (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))
+ (modules '((guix build utils)))
+ (snippet #~(substitute* "Cargo.toml"
+ ((", path =.*}") "}")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.2))
- #:cargo-development-inputs (("rust-winapi-build" ,rust-winapi-build-0.1))
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-cargo-toml
- (lambda _
- (substitute* "Cargo.toml"
- ((", path =.*}")
- "}")) #t)))))
+ #:cargo-development-inputs
+ (("rust-winapi-build" ,rust-winapi-build-0.1))))
(home-page "https://github.com/retep998/winapi-rs")
(synopsis "Function definitions for the Windows API library user32")
(description
--
2.47.1
Reply sent
to
Steve George <steve <at> futurile.net>
:
You have taken responsibility.
(Mon, 07 Apr 2025 16:13:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Herman Rimm <herman <at> rimm.ee>
:
bug acknowledged by developer.
(Mon, 07 Apr 2025 16:13:02 GMT)
Full text and
rfc822 format available.
Message #67 received at 75206-done <at> debbugs.gnu.org (full text, mbox):
Hi,
Applied this series that Herman sent in.
Herman - as I understand it the current requirement in the manual is that a patch should contain changes that "Verify that your patch contains only one set of related changes" (https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html). Some of them were very atomised, so changing a snippet and a build option split into two patches. I don't think you *have* to do it this way, unless you wish to!
Aaron - if you review a patch meaning you download it, apply it, build it and if possible install it then feel free to add a 'Reviewed-by' trailer when you reroll it. Doing reviews is a great contribution!
Details below:
On Sun, 19 Jan 2025 21:48:56 -0500, Aaron Covrig via Guix-patches via wrote:
> Thank you for your contribution Herman, I went ahead and re-based
> these patches against the latest branch commit and dropped patch #8 for
> rust-rustls-ffi-0.8 as it was removed from the rust-team branch.
>
> Herman Rimm (9):
> gnu: rust-structopt-0.3: Use snippet.
> gnu: rust-structopt-0.3: Build.
> gnu: rust-syn-2: Use snippet.
> gnu: rust-syn-1: Inherit rust-syn-2.
> gnu: rust-syn-0.11: Use snippet.
> gnu: rust-synom-0.11: Use snippet.
> gnu: rust-synom-0.11: Fix build.
> gnu: rust-uint-0.9: Use snippet.
> gnu: rust-user32-sys-0.2: Use snippet.
>
> [...]
Applied, thanks!
[1/9] gnu: rust-structopt-0.3: Use snippet.
commit: 8b40c7fd60e513d8d0355fd729b9aa9ca688e838
[2/9] gnu: rust-structopt-0.3: Build.
commit: de1f41669bc2c80838d7e558971d465d6f6d1a55
[3/9] gnu: rust-syn-2: Use snippet.
commit: 484885be6dc62d51abf79ef24b2b8e0227b87e42
[4/9] gnu: rust-syn-1: Inherit rust-syn-2.
commit: 018151f7ac641b529c40ac1742486ace25673db6
[5/9] gnu: rust-syn-0.11: Use snippet.
commit: 47904214639e75cff6f26b2d92b8aa488ab4918d
[6/9] gnu: rust-synom-0.11: Use snippet.
commit: 2014c1bbeb91701be0c94384315e119e2a45afdf
[7/9] gnu: rust-synom-0.11: Fix build.
commit: 4c436da549905238c2161f80ad7ed3e1a651535e
[8/9] gnu: rust-uint-0.9: Use snippet.
commit: 076e3f3b237aa307bfa40147859f8deb4bec7f9b
[9/9] gnu: rust-user32-sys-0.2: Use snippet.
commit: 7be2b8f57f6986654f198b43b4e96833e18b1a77
Best regards,
--
Steve George <steve <at> futurile.net>
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Tue, 06 May 2025 11:24:08 GMT)
Full text and
rfc822 format available.
This bug report was last modified 65 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.