aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
authorArun Isaac2021-12-29 20:41:34 +0530
committerArun Isaac2021-12-29 23:40:08 +0530
commit5bbb824ffb7ebac9cdd1b76e5ad8c6db8616ee31 (patch)
tree9d2d7abea5f011b473822b14957ca0b9dc8bfa5f /gn
parentb2ef78a57eded1d3a010b3b04702bed05919bf59 (diff)
downloadguix-bioinformatics-5bbb824ffb7ebac9cdd1b76e5ad8c6db8616ee31.tar.gz
Reference non-public rust packages using @@.
rust-1.47 and rust-1.49 are no longer exported from (gnu packages rust). * gn/packages/bioinformatics.scm (gfaffix): Reference rust-1.49 using @@. * gn/packages/crates-io.scm (rust-handlegraph-0.7): Reference rust-1.47 using @@.
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/bioinformatics.scm9
-rw-r--r--gn/packages/crates-io.scm9
2 files changed, 10 insertions, 8 deletions
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 391c2bf..fbe58ff 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -477,10 +477,11 @@ reads.")
(("^handlegraph.*") "handlegraph = \"0.7\"\n"))))))
(build-system cargo-build-system)
(arguments
- `(#:rust ,(if (> (string->number (version-major+minor (package-version rust-1.49)))
- (string->number (version-major+minor (package-version rust))))
- rust-1.49
- rust)
+ `(#: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
(("rust-clap" ,rust-clap-3)
("rust-rustc-hash" ,rust-rustc-hash-1)
diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 2af14f4..0433c39 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -24,10 +24,11 @@
(base32
"1frlcdwhycjvizb0gfb0v36vxjdi0jxagl2l2v6dzdjxpaawv9rs"))))
(arguments
- `(#:rust ,(if (> (string->number (version-major+minor (package-version rust-1.47)))
- (string->number (version-major+minor (package-version rust))))
- rust-1.47
- rust)
+ `(#: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
(("rust-anyhow" ,rust-anyhow-1)
("rust-boomphf" ,rust-boomphf-0.5)