Subject: bug#75206: closed (Re: [bug#75206] [PATCH rust-team v2 0/9] Slight updates)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 07 Apr 2025 16:13:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
75206: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=75206
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#75206] [PATCH rust-team v2 0/9] Slight updates
From: Steve George <[email-masked]>
To: [email-masked]
Cc: Aaron Covrig <[email-masked]>
Date: Mon, 7 Apr 2025 17:11:33 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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 <[email-masked]>

Subject: [PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet.
From: Herman Rimm <[email-masked]>
To: [email-masked]
Date: Mon, 30 Dec 2024 18:52:25 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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