nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: rust@1.23.0: Inherit from rust@1.22.0. 

* gnu/packages/rust.scm (rust-1.23)[inherit]: Inherit from rust-1.22.
[arguments]: Inherit from rust-1.22.  Delete "remove-ar" phase.
This commit is contained in:
Danny Milosavljevic 2018-09-24 00:37:58 +02:00
parent 7bf169f75c
commit a75b8c08c0
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/rust.scm
View File

@ -658,7 +658,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(define-public rust-1.23 (define-public rust-1.23
(package (package
(inherit rust-1.20) (inherit rust-1.22)
(name "rust") (name "rust")
(version "1.23.0") (version "1.23.0")
(source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))
@ -666,12 +666,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(native-inputs (native-inputs
(alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo")
(alist-replace "rustc-bootstrap" (list rust-bootstrap) (alist-replace "rustc-bootstrap" (list rust-bootstrap)
(package-native-inputs rust-1.20)))) (package-native-inputs rust-1.22))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments rust-1.20) (substitute-keyword-arguments (package-arguments rust-1.22)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'configure-archiver) (delete 'configure-archiver)
(delete 'remove-ar)
(add-after 'unpack 'dont-build-native (add-after 'unpack 'dont-build-native
(lambda _ (lambda _
;; XXX: Revisit this when we use gcc 6. ;; XXX: Revisit this when we use gcc 6.