aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
authorEfraim Flashner2022-01-09 09:35:05 +0200
committerEfraim Flashner2022-01-09 09:35:05 +0200
commit92c0553553281ad746a6468f73e24ac313c79c56 (patch)
tree62bc0c3a3fdfdb5dab990194536c9547948ffda4 /gn
parent723faa98cfac47bf6e37a7cf0e9b8f6d88c30db9 (diff)
downloadguix-bioinformatics-92c0553553281ad746a6468f73e24ac313c79c56.tar.gz
gn: Unconditionally use current rust package.
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/bioinformatics.scm7
-rw-r--r--gn/packages/crates-io.scm10
2 files changed, 3 insertions, 14 deletions
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 3e685fa..af8f322 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -477,12 +477,7 @@ reads.")
(("^handlegraph.*") "handlegraph = \"0.7\"\n"))))))
(build-system cargo-build-system)
(arguments
- `(#:rust ,(let ((rust-1.49 (@@ (gnu packages rust) rust-1.49)))
- (if (> (string->number (version-major+minor (package-version rust-1.49)))
- (string->number (version-major+minor (package-version rust))))
- rust-1.49
- rust))
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-clap" ,rust-clap-3)
("rust-rustc-hash" ,rust-rustc-hash-1)
("rust-regex" ,rust-regex-1)
diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 0433c39..d0efbcc 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -5,8 +5,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cargo)
- #:use-module (gnu packages crates-io)
- #:use-module (gnu packages rust))
+ #:use-module (gnu packages crates-io))
(define-public rust-handlegraph-0.7
@@ -24,12 +23,7 @@
(base32
"1frlcdwhycjvizb0gfb0v36vxjdi0jxagl2l2v6dzdjxpaawv9rs"))))
(arguments
- `(#:rust ,(let ((rust-1.47 (@@ (gnu packages rust) rust-1.47)))
- (if (> (string->number (version-major+minor (package-version rust-1.47)))
- (string->number (version-major+minor (package-version rust))))
- rust-1.47
- rust))
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-boomphf" ,rust-boomphf-0.5)
("rust-bstr" ,rust-bstr-0.2)