From f309420b2d6c2e20422eef89ade2b7837fe3801c Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Mon, 17 Jun 2019 19:36:10 -0700 Subject: 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. --- gnu/packages/rust.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages/rust.scm') 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 @@ (define-public rust-1.30 (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 @@ (define-public rust-1.31 "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) -- cgit v1.2.3 From f676b2a45fd3f91eb12006adb957ff55bfe8514b Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Mon, 17 Jun 2019 19:39:08 -0700 Subject: gnu: rust: downgrade older versions to llvm@6 * gnu/packages/rust.scm: (rust-1.30): Remove llvm override. --- gnu/packages/rust.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 76a38736ac..c83c8a6784 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -872,10 +872,6 @@ (define-public rust-1.30 (delete-file-recursively "src/tools/clang") (delete-file-recursively "src/tools/lldb") #t)))) - (inputs - ;; Use LLVM 7.0 - (alist-replace "llvm" (list llvm) - (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) -- cgit v1.2.3 From f5de2b9a3e0070ec431e01c279192e6d93d6a1c8 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Mon, 17 Jun 2019 22:10:52 -0700 Subject: gnu: rust: use llvm@8 * gnu/packages/llvm.scm (llvm): Rename to... (llvm-8): ...this. (llvm): New variable. * gnu/packages/rust.scm (rust)[inputs]: Use llvm-8 --- gnu/packages/llvm.scm | 4 +++- gnu/packages/rust.scm | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index faf9e40049..0315740bcd 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -48,7 +48,7 @@ (define-module (gnu packages llvm) #:use-module (gnu packages python) #:use-module (gnu packages xml)) -(define-public llvm +(define-public llvm-8 (package (name "llvm") (version "8.0.0") @@ -99,6 +99,8 @@ (define-public llvm of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) +(define-public llvm llvm-8) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c83c8a6784..9444d8be73 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1056,6 +1056,9 @@ (define-public rust "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) -- cgit v1.2.3