me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust: Use search-patches instead of map search-patch 

* gnu/packages/rust.scm: Replace instances of map search-patch with
search-patches.
master
Jakub Kądziołka 2020-07-17 15:22:57 +02:00
parent 17666c090b
commit e28a824f08
No known key found for this signature in database
GPG Key ID: E315A75846131564
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/packages/rust.scm
View File

@ -227,7 +227,7 @@ safety and thread safety guarantees.")
(sha256 (base32 "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")) (sha256 (base32 "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (delete-file-recursively "src/llvm") #t)) (snippet '(begin (delete-file-recursively "src/llvm") #t))
(patches (map search-patch '("rust-1.19-mrustc.patch"))))) (patches (search-patches "rust-1.19-mrustc.patch"))))
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
(properties '((timeout . 72000) ;20 hours (properties '((timeout . 72000) ;20 hours
(max-silent-time . 18000))) ;5 hours (for armel) (max-silent-time . 18000))) ;5 hours (for armel)
@ -718,8 +718,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(delete-file-recursively "src/llvm") (delete-file-recursively "src/llvm")
(delete-file-recursively "src/llvm-emscripten") (delete-file-recursively "src/llvm-emscripten")
#t)) #t))
(patches (map search-patch (patches (search-patches
'("rust-1.25-accept-more-detailed-gdb-lines.patch"))))) "rust-1.25-accept-more-detailed-gdb-lines.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases) ((#:phases phases)
@ -753,9 +753,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(patches (map search-patch (patches (search-patches
'("rust-coresimd-doctest.patch" "rust-coresimd-doctest.patch"
"rust-1.25-accept-more-detailed-gdb-lines.patch"))))) "rust-1.25-accept-more-detailed-gdb-lines.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases) ((#:phases phases)
@ -823,10 +823,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(patches (map search-patch '("rust-coresimd-doctest.patch" (patches (search-patches "rust-coresimd-doctest.patch"
"rust-bootstrap-stage0-test.patch" "rust-bootstrap-stage0-test.patch"
"rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch"
"rust-reproducible-builds.patch"))))) "rust-reproducible-builds.patch"))))
(native-inputs (native-inputs
;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically.
;; See <https://bugs.gnu.org/37810>. ;; See <https://bugs.gnu.org/37810>.
@ -859,10 +859,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(patches (map search-patch '("rust-coresimd-doctest.patch" (patches (search-patches "rust-coresimd-doctest.patch"
"rust-bootstrap-stage0-test.patch" "rust-bootstrap-stage0-test.patch"
"rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch"
"rust-reproducible-builds.patch"))))) "rust-reproducible-builds.patch"))))
(inputs (inputs
;; Use LLVM 6.0 ;; Use LLVM 6.0
(alist-replace "llvm" (list llvm-6) (alist-replace "llvm" (list llvm-6)
@ -895,8 +895,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(patches (map search-patch '("rust-1.25-accept-more-detailed-gdb-lines.patch" (patches (search-patches "rust-1.25-accept-more-detailed-gdb-lines.patch"
"rust-reproducible-builds.patch")))))))) "rust-reproducible-builds.patch")))))))
(define-public rust-1.30 (define-public rust-1.30
(let ((base-rust (let ((base-rust
@ -1010,7 +1010,7 @@ move around."
(delete-file-recursively "src/tools/lldb") (delete-file-recursively "src/tools/lldb")
(delete-file-recursively "vendor/jemalloc-sys/jemalloc") (delete-file-recursively "vendor/jemalloc-sys/jemalloc")
#t)) #t))
(patches (map search-patch '("rust-reproducible-builds.patch"))) (patches (search-patches "rust-reproducible-builds.patch"))
;; the vendor directory has moved to the root of ;; the vendor directory has moved to the root of
;; the tarball, so we have to strip an extra prefix ;; the tarball, so we have to strip an extra prefix
(patch-flags '("-p2")))) (patch-flags '("-p2"))))