guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

72/137: gnu: rust-rsa-0.5: Move substitution to source.


From: guix-commits
Subject: 72/137: gnu: rust-rsa-0.5: Move substitution to source.
Date: Thu, 21 Dec 2023 04:26:25 -0500 (EST)

efraim pushed a commit to branch rust-team
in repository guix.

commit 8474ea38a9a564ab9e8e2a29b2cece81e6dba571
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Dec 20 15:41:09 2023 +0200

    gnu: rust-rsa-0.5: Move substitution to source.
    
    * gnu/packages/crates-io.scm (rust-rsa-0.5)[source]: Add snippet to
    adjust crate dependency versions.
    [arguments]: Remove custom 'relax-requirements phase.
    * gnu/packages/rust-apps.scm (rbw)[arguments]: Remove substitution from
    custom 'relax-requirements phase.
    
    Change-Id: Ie39f0e9c160e18e8d0213aeaea8b86b292a14df0
---
 gnu/packages/crates-io.scm | 15 ++++++---------
 gnu/packages/rust-apps.scm |  3 ---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 49763bb28e..ed68e3131c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63783,7 +63783,11 @@ can handle huge texts and memory-incoherent edits with 
ease.")
        (uri (crate-uri "rsa" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "039676a4mj0875phdi7vc0bd37hv84dh0dql6fmk8dl2w81jcp70"))))
+        (base32 "039676a4mj0875phdi7vc0bd37hv84dh0dql6fmk8dl2w81jcp70"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   (("version = \">=1, <1.5\"") "version = \"^1\""))))))
     (arguments
      `(#:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
@@ -63807,14 +63811,7 @@ can handle huge texts and memory-incoherent edits with 
ease.")
          ("rust-serde-test" ,rust-serde-test-1)
          ("rust-sha-1" ,rust-sha-1-0.9)
          ("rust-sha2" ,rust-sha2-0.9)
-         ("rust-sha3" ,rust-sha3-0.9))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'configure 'relax-requirements
-           (lambda _
-             (substitute*
-                 "Cargo.toml"
-               (("version = \">=1, <1.5\"") "version = \"^1\"")))))))))
+         ("rust-sha3" ,rust-sha3-0.9))))))
 
 (define-public rust-rspec-1
   (package
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 4d2c643c1d..51f20fb01b 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2015,9 +2015,6 @@ runs a command whenever it detects modifications.")
              (substitute*
                  "guix-vendor/rust-password-hash-0.3.2.tar.gz/Cargo.toml"
                (("version = \">=1, <1.1.0\"") "version = \">=1\""))
-             (substitute*
-                 "guix-vendor/rust-rsa-0.5.0.tar.gz/Cargo.toml"
-               (("version = \">=1, <1.5\"") "version = \"^1\""))
              (substitute*
                  "Cargo.toml"
                (("version = \"1.4\"") "version = \"^1\"")))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]