diff options
| author | Efraim Flashner | 2021-08-18 11:15:48 +0300 |
|---|---|---|
| committer | Efraim Flashner | 2021-08-19 11:54:37 +0300 |
| commit | 6b05f2e1960e5fde7ad723f3a9e09e06565795e3 (patch) | |
| tree | 9da3a6539c9b859bcab1892de67a7422c8a98a90 | |
| parent | ac3cdf57e7169582b60f36aed3a6aa220bef6852 (diff) | |
| download | guix-bioinformatics-6b05f2e1960e5fde7ad723f3a9e09e06565795e3.tar.gz | |
gn: make sure we use the correct rust version
| -rw-r--r-- | gn/packages/bioinformatics.scm | 5 | ||||
| -rw-r--r-- | gn/packages/crates-io.scm | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm index b2ff1ed..d8f0c9a 100644 --- a/gn/packages/bioinformatics.scm +++ b/gn/packages/bioinformatics.scm @@ -472,7 +472,10 @@ reads.") (("^handlegraph.*") "handlegraph = \"0.7\"\n")))))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.49 ; or later + `(#:rust ,(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 01438d8..2af14f4 100644 --- a/gn/packages/crates-io.scm +++ b/gn/packages/crates-io.scm @@ -24,7 +24,10 @@ (base32 "1frlcdwhycjvizb0gfb0v36vxjdi0jxagl2l2v6dzdjxpaawv9rs")))) (arguments - `(#:rust ,rust-1.47 ; or later + `(#:rust ,(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) |