diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
| commit | 6e1f8d552b73e508bba47dedb5676ce5ccdcc398 (patch) | |
| tree | 952a8fa2652ad26946100707311824b8c7a88768 /gnu/packages/rust.scm | |
| parent | c24b896365ebf0c783140e53e000305e682d18c5 (diff) | |
| parent | 8e92d5465fc154fed5d06f7e4a64d7dcccded74d (diff) | |
| download | patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9c8088b2f7..9444d8be73 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -871,14 +871,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (delete-file-recursively "src/llvm-emscripten") (delete-file-recursively "src/tools/clang") (delete-file-recursively "src/tools/lldb") - #t)) - (patches (map search-patch '("rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-1.30-gdb-llvm.patch" - "rust-reproducible-builds.patch"))))) - (inputs - ;; Use LLVM 7.0 - (alist-replace "llvm" (list llvm) - (package-inputs base-rust))) + #t)))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -918,12 +911,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli"))) (package (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (patches (map search-patch '("rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-1.30-gdb-llvm.patch" - "rust-reproducible-builds.patch"))))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -1069,6 +1056,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"))) (package (inherit base-rust) + (inputs + (alist-replace "llvm" (list llvm-8) + (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) |