[PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet.

  • Open
  • quality assurance status badge
Details
One participant
  • Herman Rimm
Owner
unassigned
Submitted by
Herman Rimm
Severity
normal
H
H
Herman Rimm wrote 5 days ago
(address . guix-patches@gnu.org)
87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@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(-)

Toggle diff (45 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 02/10] gnu: rust-structopt-0.3: Build.
(address . 75206@debbugs.gnu.org)
fd0ff1282a13337f020ae8c728bd5e3381e7dc10.1735580850.git.herman@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 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

Toggle diff (27 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 03/10] gnu: rust-syn-2: Use snippet.
(address . 75206@debbugs.gnu.org)
fcde60f8887ecda53793ac6e5ad98f32e27b7aad.1735580850.git.herman@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(-)

Toggle diff (47 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 04/10] gnu: rust-syn-1: Inherit rust-syn-2.
(address . 75206@debbugs.gnu.org)
9a56c7eee6b1a14d0ef6a757c79b6b38c4778005.1735580850.git.herman@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(-)

Toggle diff (55 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 05/10] gnu: rust-syn-0.11: Use snippet.
(address . 75206@debbugs.gnu.org)
7eab3562b8e588ba9c953a814a76d1a45e3f0bf2.1735580850.git.herman@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(-)

Toggle diff (32 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 06/10] gnu: rust-synom-0.11: Use snippet.
(address . 75206@debbugs.gnu.org)
6c89e8aae1013446d78150d03ca8c6a08128491f.1735580850.git.herman@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(-)

Toggle diff (33 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 07/10] gnu: rust-synom-0.11: Fix build.
(address . 75206@debbugs.gnu.org)
8bea20d56fee6f34ef63f49512eb36d20310f74e.1735580850.git.herman@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(+)

Toggle diff (14 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 08/10] gnu: rust-uint-0.9: Use snippet.
(address . 75206@debbugs.gnu.org)
82e1489bacda8a48798cf1f277b857e4367bc870.1735580850.git.herman@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(-)

Toggle diff (43 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 09/10] gnu: rust-rustls-ffi-0.8: Use snippet.
(address . 75206@debbugs.gnu.org)
63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@rimm.ee
* 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(-)

Toggle diff (48 lines)
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
H
H
Herman Rimm wrote 5 days ago
[PATCH rust-team 10/10] gnu: rust-user32-sys-0.2: Use snippet.
(address . 75206@debbugs.gnu.org)
5b929503c39015aae1423f31f4410d56e209e470.1735580850.git.herman@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(-)

Toggle diff (30 lines)
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
?
Your comment

Commenting via the web interface is currently disabled.

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

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