[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: address@hidden: Inherit from address@hidden
dannym pushed a commit to branch wip-rust
in repository guix.
commit a75b8c08c0a28b1243680efccbe59ec5aa88795d
Author: Danny Milosavljevic <address@hidden>
Date: Mon Sep 24 00:37:58 2018 +0200
gnu: address@hidden: Inherit from address@hidden
* gnu/packages/rust.scm (rust-1.23)[inherit]: Inherit from rust-1.22.
[arguments]: Inherit from rust-1.22. Delete "remove-ar" phase.
---
gnu/packages/rust.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 7871946..6eb71d2 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -658,7 +658,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(define-public rust-1.23
(package
- (inherit rust-1.20)
+ (inherit rust-1.22)
(name "rust")
(version "1.23.0")
(source (rust-source version
"14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))
@@ -666,12 +666,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(native-inputs
(alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo")
(alist-replace "rustc-bootstrap" (list rust-bootstrap)
- (package-native-inputs rust-1.20))))
+ (package-native-inputs rust-1.22))))
(arguments
- (substitute-keyword-arguments (package-arguments rust-1.20)
+ (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.