diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2018-09-24 00:40:58 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2018-10-30 20:41:55 +0100 |
| commit | 44d530ef095acb78847e917be4bfe70753561ead (patch) | |
| tree | 92e3cff0982096ca29ba20238dfd882ee09a30f3 | |
| parent | a75b8c08c0a28b1243680efccbe59ec5aa88795d (diff) | |
| download | guix-44d530ef095acb78847e917be4bfe70753561ead.tar.gz | |
gnu: rust@1.23.0: Bootstrap from rust@1.22.0.
* gnu/packages/rust.scm (rust-1.23): Bootstrap from rust@1.22.0.
| -rw-r--r-- | gnu/packages/rust.scm | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6eb71d2787..25ced10d9c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -657,28 +657,22 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) (define-public rust-1.23 - (package - (inherit rust-1.22) - (name "rust") - (version "1.23.0") - (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) - ;; Use rust-bootstrap@1.22 package to build rust 1.23 - (native-inputs - (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") - (alist-replace "rustc-bootstrap" (list rust-bootstrap) - (package-native-inputs rust-1.22)))) - (arguments - (substitute-keyword-arguments (package-arguments rust-1.22) - ((#:phases phases) - `(modify-phases ,phases - (delete 'configure-archiver) - (delete 'remove-ar) - (add-after 'unpack 'dont-build-native - (lambda _ - ;; XXX: Revisit this when we use gcc 6. - (substitute* "src/binaryen/CMakeLists.txt" - (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t)))))))) + (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0" + "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-archiver) + (delete 'remove-ar) + (add-after 'unpack 'dont-build-native + (lambda _ + ;; XXX: Revisit this when we use gcc 6. + (substitute* "src/binaryen/CMakeLists.txt" + (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) + #t))))))))) (define-public rust-1.24 (let ((base-rust |