diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
| commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
| tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /gnu/packages/rust.scm | |
| parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
| parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
| download | guix-patches-64de896a71a9ba3091259834077d54c0146bdab6.tar guix-patches-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b3c6d538ac..7237f4cd4b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; @@ -1047,7 +1047,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (delete-file-recursively "vendor/jemalloc-sys/jemalloc") #t))))))) -(define-public rust +(define-public rust-1.35 (let ((base-rust (rust-bootstrapped-package rust-1.34 "1.35.0" "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"))) @@ -1069,3 +1069,15 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "src/tools/tidy/src/main.rs" (("bins::check") "//bins::check")) #t))))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.35 "1.36.0" + "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (delete 'patch-process-docs-rev-cmd)))))))) |