From 317b139c5dc7e4501d79cd0952444b4b068bee5c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 10:42:54 +0200 Subject: gnu: rust: Update to 1.27.2. * gnu/packages/rust.scm (rust): Update to 1.27.2. --- 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 b053bdce62..c40a47c4d9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -790,8 +790,8 @@ (define-public rust-1.26 (define-public rust (let ((base-rust - (rust-bootstrapped-package rust-1.26 "1.27.0" - "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" + (rust-bootstrapped-package rust-1.26 "1.27.2" + "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" #:patches '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" -- cgit v1.2.3 From 4a90fcf9e7a71a1672d9aa86f367f07ad297f899 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 12:18:26 +0200 Subject: gnu: mrustc: Enable tests. * gnu/packages/rust.scm (mrustc)[arguments]: Add #:test-target. <#:phases>[install]: Don't install test output. --- gnu/packages/rust.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c40a47c4d9..e1c32dbe10 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -200,7 +200,7 @@ (define-public mrustc ("rustc" ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) (arguments - `(#:tests? #f + `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" (assoc-ref %build-inputs "llvm") "/bin/llvm-config")) @@ -250,6 +250,7 @@ (define-public mrustc (gcc (assoc-ref inputs "gcc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) + (delete-file-recursively "output/local_tests") (mkdir-p lib) (copy-recursively "output" lib/rust) (mkdir-p bin) -- cgit v1.2.3 From 6c1a6584149b542321597741b3f1459743be2b3e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 14:38:10 +0200 Subject: gnu: rust@1.19.0: Install libtest. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Build libtest. --- gnu/packages/rust.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e1c32dbe10..74de6f3ae1 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -411,6 +411,8 @@ (define rust-1.19 "output/rustc-build/rustc" "-C" (string-append "linker=" (getenv "CC")) + ;; Required for libterm. + "-Z" "force-unstable-if-unmarked" "-L" "output/target-libs" (string-append "src/" name "/lib.rs") "-o" @@ -430,7 +432,13 @@ (define rust-1.19 ("libpanic_unwind") ;; Uses "cc" to link. ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") - ("libarena"))) + ("libarena") + + ;; Test dependencies: + + ("libgetopts") + ("libterm") + ("libtest"))) #t))) ;; This phase is overridden by newer versions. (replace 'check -- cgit v1.2.3