From a3997b83ff24007d0d3d14ff61e7e91133bd593b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 12:33:03 +0200 Subject: gnu: Rust: Use 'gdb-minimal' for tests. * gnu/packages/rust.scm (rust-1.19.0)[native-inputs]: Change from GDB to GDB-MINIMAL. --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d139657f39..b084a6df9e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -420,7 +420,7 @@ test = { path = \"../libtest\" } `(("bison" ,bison) ; For the tests ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests - ("gdb" ,gdb) ; For the tests + ("gdb" ,gdb-minimal) ; For the tests ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) -- cgit 1.4.1 From c007d868686fc2f9bf02a34150d4f0ac72b1f8d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 12:34:48 +0200 Subject: gnu: gdb@8.2: Inherit from 'gdb-minimal'. * gnu/packages/gdb.scm (gdb-minimal): Move definition up. (gdb-8.2): Rename to ... (gdb-minimal-8.2): ... this. Inherit from GDB-MINIMAL. * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Adjust for the rename. --- gnu/packages/gdb.scm | 18 +++++++++--------- gnu/packages/rust.scm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 56d37960f7..f2f272cc90 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -122,11 +122,18 @@ the program is running to try to fix bugs. It can be used to debug programs written in C, C++, Ada, Objective-C, Pascal and more.") (license gpl3+))) +(define-public gdb-minimal + (package/inherit + gdb + (name "gdb-minimal") + (inputs (fold alist-delete (package-inputs gdb) + '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) + ;; This version of GDB is required by some of the Rust compilers, see ;; . -(define-public gdb-8.2 +(define-public gdb-minimal-8.2 (package - (inherit gdb) + (inherit gdb-minimal) (version "8.2.1") (source (origin (method url-fetch) @@ -135,10 +142,3 @@ written in C, C++, Ada, Objective-C, Pascal and more.") (sha256 (base32 "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) - -(define-public gdb-minimal - (package/inherit - gdb - (name "gdb-minimal") - (inputs (fold alist-delete (package-inputs gdb) - '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b084a6df9e..fe43e72421 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -828,7 +828,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (native-inputs ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. ;; See . - (alist-replace "gdb" (list gdb-8.2) + (alist-replace "gdb" (list gdb-minimal-8.2) (package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) -- cgit 1.4.1 From 5e6d583954b8ca9c4ab2eed3347a92a3ad7ad6fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Jul 2020 23:26:46 +0200 Subject: gnu: gdb@8.2: Inherit from the 'full' gdb. This reverts commit c007d868686fc2f9bf02a34150d4f0ac72b1f8d2, because later versions of Rust requires loading Python plugins. * gnu/packages/gdb.scm (gdb-minimal-8.2): Rename to ... (gdb-8.2): ... this. Adjust inheritance accordingly. * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Adjust accordingly. --- gnu/packages/gdb.scm | 4 ++-- gnu/packages/rust.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index f2f272cc90..b836228506 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -131,9 +131,9 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; This version of GDB is required by some of the Rust compilers, see ;; . -(define-public gdb-minimal-8.2 +(define-public gdb-8.2 (package - (inherit gdb-minimal) + (inherit gdb) (version "8.2.1") (source (origin (method url-fetch) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fe43e72421..b084a6df9e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -828,7 +828,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (native-inputs ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. ;; See . - (alist-replace "gdb" (list gdb-minimal-8.2) + (alist-replace "gdb" (list gdb-8.2) (package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) -- cgit 1.4.1 From 6ba3980e748099d9ee21abd246aeb86ed777744c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Jul 2020 23:27:14 +0200 Subject: gnu: Rust: Use gdb@8. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Remove GDB-MINIMAL. Add GDB-8.2. (rust-1.27)[native-inputs]: Remove. --- gnu/packages/rust.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b084a6df9e..9e753d6f99 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -420,7 +420,9 @@ test = { path = \"../libtest\" } `(("bison" ,bison) ; For the tests ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests - ("gdb" ,gdb-minimal) ; For the tests + ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. + ;; See . Use it on all Rusts for simplicity. + ("gdb" ,gdb-8.2) ; For the tests ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -825,11 +827,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "rust-bootstrap-stage0-test.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-reproducible-builds.patch"))))) - (native-inputs - ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. - ;; See . - (alist-replace "gdb" (list gdb-8.2) - (package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) -- cgit 1.4.1 From 25cdd9f7a469f4394568be7e7648021cc723aaae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Jul 2020 10:06:03 +0300 Subject: gnu: rust: Update to 1.45. * gnu/packages/rust.scm (rust): Change to 1.45. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9cb0ae59ca..a123bc4eec 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov -;;; Copyright © 2017, 2019 Efraim Flashner +;;; Copyright © 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov @@ -1315,4 +1315,4 @@ move around." #t))))))))) ;; TODO(staging): Bump this variable to the latest packaged rust. -(define-public rust rust-1.39) +(define-public rust rust-1.45) -- cgit 1.4.1 From 810f4cc187fff8dfae0ddde460f48b383498d482 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Jul 2020 10:55:03 +0300 Subject: gnu: rust-1.28: Remove disable-cargo-test-for-nightly-channel phase. * gnu/packages/rust.scm (rust-1.28)[arguments]: Remove custom 'disable-cargo-test-for-nightly-channel phase. (rust-1.40)[arguments]: Don't remove removed phase. --- gnu/packages/rust.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a123bc4eec..0c15205773 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -800,7 +800,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn finds_author_git") "#[ignore]\nfn finds_author_git") (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) - ;; TODO(rebuild-rust): Remove this phase in rust-1.28 when rebuilding. (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ ;; This test failed to work on "nightly" channel builds @@ -880,6 +879,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "src/test/run-pass/issue-44056.rs" (("only-x86_64") "ignore-test")) #t)) + ;; This is no longer needed as of 1.28 + (delete 'disable-cargo-test-for-nightly-channel) ;; The thinlto test should pass with llvm 6. (delete 'disable-thinlto-test)))))))) @@ -1249,8 +1250,6 @@ move around." ,(patch-command-exec-tests-phase '(match (find-files "src/test" "command-exec\\.rs") ((file) file)))) - ;; TODO(rebuild-rust): The test in question got fixed long ago. - (delete 'disable-cargo-test-for-nightly-channel) ;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15 ;; "Remove painful test that is not pulling its weight" (delete 'remove-unsupported-tests))))))))) -- cgit 1.4.1 From db5604870eb1c870828741861f3fd110568abdaa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Jul 2020 10:57:13 +0300 Subject: gnu: rust-1.38: Build with llvm-9. * gnu/packages/rust.scm (rust-1.38)[inputs]: Build with llvm-9. (rust-1.40)[inputs]: Don't replace llvm version. --- gnu/packages/rust.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0c15205773..9b8e7e2604 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1143,14 +1143,13 @@ move around." (setenv "CARGO_HOME" cargo-home) #t)))))))))) -;; TODO(rebuild-rust): Switch to LLVM 9 in 1.38 instead of 1.40. (define-public rust-1.38 (let ((base-rust (rust-bootstrapped-package rust-1.37 "1.38.0" "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))) (package (inherit base-rust) - #;(inputs + (inputs (alist-replace "llvm" (list llvm-9) (package-inputs base-rust))) (arguments @@ -1193,9 +1192,6 @@ move around." "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"))) (package (inherit base-rust) - (inputs - (alist-replace "llvm" (list llvm-9) - (package-inputs base-rust))) (source (origin (inherit (package-source base-rust)) -- cgit 1.4.1 From b9c30fe7d61d1594fa7589cda6945095af1d27ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 29 Jul 2020 08:07:24 +0300 Subject: gnu: rust-1.26: Build with newer openssl. * gnu/packages/rust.scm (rust-1.26)[unputs]: Replace openssl-1.0 with openssl. --- gnu/packages/rust.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9b8e7e2604..8e3afdd2ed 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -758,6 +758,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (patches (search-patches "rust-coresimd-doctest.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch")))) + (inputs + (alist-replace "openssl" (list openssl) + (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) -- cgit 1.4.1