GNU bug report logs - #75206
[PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet.

Previous Next

Package: guix-patches;

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.

Full log


View this message in rfc822 format

From: Aaron Covrig <aaron.covrig.us <at> ieee.org>
To: 75206 <at> debbugs.gnu.org
Cc: Herman Rimm <herman <at> rimm.ee>
Subject: [bug#75206] [PATCH rust-team v2 1/9] gnu: rust-structopt-0.3: Use snippet.
Date: Sun, 19 Jan 2025 21:48:57 -0500
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





This bug report was last modified 95 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.