From bda5538b5a0d603aa84ec151816d51ea55712773 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Dec 2023 15:41:09 +0200 Subject: [PATCH] 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 9a83a117d5..0c473b6ac5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -63841,7 +63841,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) @@ -63865,14 +63869,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\"")))))