aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Petkov <ivanppetkov@gmail.com>2019-06-17 19:36:10 -0700
committerIvan Petkov <ivanppetkov@gmail.com>2019-06-28 18:31:47 -0700
commitf309420b2d6c2e20422eef89ade2b7837fe3801c (patch)
tree50aa488126b392e5e51dd9d24456b3570786e78c
parent3d0c9ff83ec82a404bd25e270dc1262169af0c7e (diff)
downloadguix-f309420b2d6c2e20422eef89ade2b7837fe3801c.tar
guix-f309420b2d6c2e20422eef89ade2b7837fe3801c.tar.gz
gnu: rust: remove debug-info patch thanks to newer gdb version
* gnu/local.mk: (dist_patch_DATA): Delete %D%/packages/patches/rust-1.30-gdb-llvm.patch * gnu/packages/rust.scm: (rust-1.30): Delete patch overrides. (rust-1.31): Delete patch overrides.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/rust.scm11
2 files changed, 1 insertions, 11 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index f5d53b49b8..8f63d0bd14 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1267,7 +1267,6 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
- %D%/packages/patches/rust-1.30-gdb-llvm.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 9c8088b2f7..76a38736ac 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -871,10 +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")))))
+ #t))))
(inputs
;; Use LLVM 7.0
(alist-replace "llvm" (list llvm)
@@ -918,12 +915,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)