diff options
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 1712 |
1 files changed, 548 insertions, 1164 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 56e6e720c0..2d29c2acd7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -4,13 +4,14 @@ ;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> -;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,455 +108,274 @@ (inherit base-rust) (version version) (source - (origin - (inherit (package-source base-rust)) - (uri (rust-uri version)) - (sha256 (base32 checksum)))) + (origin + (inherit (package-source base-rust)) + (uri (rust-uri version)) + (sha256 (base32 checksum)))) (native-inputs (alist-replace "cargo-bootstrap" (list base-rust "cargo") (alist-replace "rustc-bootstrap" (list base-rust) (package-native-inputs base-rust)))))) -(define-public mrustc - (let ((rustc-version "1.19.0")) - (package - (name "mrustc") - (version "0.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thepowersgang/mrustc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2")))) - (outputs '("out" "cargo")) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)))) - (arguments - `(#:test-target "test" - #:make-flags - (list ,(string-append "RUSTC_TARGET=" - (or (%current-target-system) - (nix-system->gnu-triplet-for-rust)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-date - (lambda _ - (substitute* "Makefile" - (("shell date") "shell date -d @1")) - (substitute* "run_rustc/Makefile" - (("[$]Vtime ") "$V ")) - #t)) - (add-after 'patch-date 'unpack-target-compiler - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "tar" "xf" (assoc-ref inputs "rustc")) - (chdir ,(string-append "rustc-" rustc-version "-src")) - (invoke "patch" "-p0" ,(string-append "../rustc-" rustc-version - "-src.patch")) - (chdir "..") - (setenv "RUSTC_VERSION" ,rustc-version) - (setenv "MRUSTC_TARGET_VER" - ,(version-major+minor rustc-version)) - (setenv "OUTDIR_SUF" "") - #t)) - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" (string-append (assoc-ref inputs "gcc") - "/bin/gcc")) - (setenv "CXX" (string-append (assoc-ref inputs "gcc") - "/bin/g++")) - #t)) - (add-after 'build 'build-minicargo - (lambda* (#:key make-flags #:allow-other-keys) - ;; TODO: minicargo.mk: RUSTC_VERSION=$(RUSTC_VERSION) RUSTC_CHANNEL=$(RUSTC_SRC_TY) OUTDIR_SUF=$(OUTDIR_SUF) - (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) - (apply invoke "make" "-C" "tools/minicargo" make-flags))) - ;(add-after 'check 'check-locally - ; (lambda* (#:key make-flags #:allow-other-keys) - ; ;; The enum test wouldn't work otherwise. - ; ;; See <https://github.com/thepowersgang/mrustc/issues/137>. - ; (setenv "MRUSTC_TARGET_VER" ,(version-major+minor rustc-version)) - ; (apply invoke "make" "local_tests" make-flags))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (tools-bin (string-append out "/tools/bin")) - (cargo-out (assoc-ref outputs "cargo")) - (cargo-bin (string-append cargo-out "/bin")) - (lib (string-append out "/lib")) - (lib/rust (string-append lib "/mrust")) - (gcc (assoc-ref inputs "gcc")) - (run_rustc (string-append out - "/share/mrustc/run_rustc"))) - ;; These files are not reproducible. - (for-each delete-file (find-files "output" "\\.txt$")) - ;(delete-file-recursively "output/local_tests") - (mkdir-p (dirname lib/rust)) - (copy-recursively "output" lib/rust) - (mkdir-p bin) - (mkdir-p tools-bin) - (install-file "bin/mrustc" bin) - ;; minicargo uses relative paths to resolve mrustc. - (install-file "tools/bin/minicargo" tools-bin) - (install-file "tools/bin/minicargo" cargo-bin) - (mkdir-p run_rustc) - (copy-file "run_rustc/Makefile" - (string-append run_rustc "/Makefile")) - #t)))))) - (synopsis "Compiler for the Rust programming language") - (description "Rust is a systems programming language that provides memory -safety and thread safety guarantees.") - (home-page "https://github.com/thepowersgang/mrustc") - ;; Dual licensed. - (license (list license:asl2.0 license:expat))))) - -(define rust-1.19 +;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed +;;; to be used in source form. +(define %mrustc-source + (let ((name "mrustc") + (version "0.9")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thepowersgang/mrustc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2"))))) + +;;; Rust 1.29 is special in that it is built with mrustc, which shortens the +;;; bootstrap path. Note: the build is non-deterministic. +(define-public rust-1.29 (package (name "rust") - (version "1.19.0") + (version "1.29.2") (source - (origin - (method url-fetch) - (uri (rust-uri "1.19.0")) - (sha256 (base32 "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")) - (modules '((guix build utils))) - (snippet '(begin (delete-file-recursively "src/llvm") #t)) - (patches (search-patches "rust-1.19-mrustc.patch")))) + (origin + (method url-fetch) + (uri (rust-uri version)) + (sha256 (base32 "1jb787080z754caa2w3w1amsygs4qlzj9rs1vy64firfmabfg22h")) + (modules '((guix build utils))) + (snippet '(for-each delete-file-recursively + '("src/jemalloc" + "src/llvm" + "src/llvm-emscripten"))) + (patches (search-patches "rust-reproducible-builds.patch")))) (outputs '("out" "cargo")) - (properties '((timeout . 72000) ;20 hours - (max-silent-time . 18000))) ;5 hours (for armel) + (properties '((timeout . 72000) ;20 hours + (max-silent-time . 18000))) ;5 hours (for armel) + (build-system gnu-build-system) + (inputs + `(("libcurl" ,curl) + ("libssh2" ,libssh2) + ;; Use llvm-7, which enables rust to be built reproducibly. + ;; Versions newer than 7 fail to compile. + ("llvm" ,llvm-7) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ;; Required for the libstd sources. + ("mrustc-source" ,%mrustc-source))) (arguments `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' - #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) + #:modules ((guix build cargo-utils) + (guix build utils) + (guix build gnu-build-system)) + #:test-target "test" + ;; Rust's own .so library files are not found in any RUNPATH, but + ;; that doesn't seem to cause issues. + #:validate-runpath? #f + #:make-flags + (list ,(string-append "RUSTC_TARGET=" + (or (%current-target-system) + (nix-system->gnu-triplet-for-rust))) + ,(string-append "RUSTCSRC=../")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env + (add-after 'unpack 'patch-reference-to-cc + ;; This prevents errors like 'error: linker `cc` not found' when + ;; "cc" is not found on PATH. (lambda* (#:key inputs #:allow-other-keys) - ;; Disable test for cross compilation support. - (setenv "CFG_DISABLE_CROSS_TESTS" "1") - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - ;; guix llvm-3.9.1 package installs only shared libraries - (setenv "LLVM_LINK_SHARED" "1") - #t)) - (add-after 'unpack 'patch-cargo-tomls - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "src/librustc_errors/Cargo.toml" - (("[[]dependencies[]]") " -[dependencies] -term = \"0.4.4\" -")) - (substitute* "src/librustc/Cargo.toml" - (("[[]dependencies[]]") " -[dependencies] -getopts = { path = \"../libgetopts\" } -")) - (substitute* "src/librustdoc/Cargo.toml" - (("[[]dependencies[]]") " -[dependencies] -test = { path = \"../libtest\" } -")) - #t)) - (add-after 'unpack 'patch-tests + (let ((gcc (assoc-ref inputs "gcc"))) + (substitute* (find-files "." "^link.rs$") + (("\"cc\".as_ref") + (format #f "~s.as_ref" (string-append gcc "/bin/gcc"))))))) + (add-after 'unpack 'copy-mrustc-and-patch (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "src/libstd/process.rs" - ;; The newline is intentional. - ;; There's a line length "tidy" check in Rust which would - ;; fail otherwise. - (("\"/bin/sh\"") (string-append "\n\"" bash "/bin/sh\""))) - (substitute* "src/libstd/net/tcp.rs" - ;; There is no network in build environment - (("fn connect_timeout_unroutable") - "#[ignore]\nfn connect_timeout_unroutable")) - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html> - (substitute* "src/libstd/sys/unix/process/process_common.rs" - (("fn test_process_mask") "#[allow(unused_attributes)] - #[ignore] - fn test_process_mask")) - #t))) - (add-after 'patch-tests 'patch-aarch64-test - (lambda* _ - (substitute* "src/librustc_back/dynamic_lib.rs" - ;; This test is known to fail on aarch64 and powerpc64le: - ;; https://github.com/rust-lang/rust/issues/45410 - (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) - #t)) - (add-after 'patch-tests 'use-readelf-for-tests - (lambda* _ - ;; nm doesn't recognize the file format because of the - ;; nonstandard sections used by the Rust compiler, but readelf - ;; ignores them. - (substitute* "src/test/run-make/atomic-lock-free/Makefile" - (("\tnm ") - "\treadelf -c ")) - #t)) - (add-after 'patch-tests 'remove-unsupported-tests - (lambda* _ - ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00193.html> - (delete-file-recursively "src/test/run-make/linker-output-non-utf8") - #t)) + (copy-recursively (assoc-ref inputs "mrustc-source") "mrustc") + (invoke "patch" "-p0" "-i" "mrustc/rustc-1.29.0-src.patch"))) + (add-after 'copy-mrustc-and-patch 'patch-makefiles + ;; This disables building the (unbundled) LLVM. + (lambda* (#:key inputs parallel-build? #:allow-other-keys) + (let ((llvm (assoc-ref inputs "llvm")) + (job-spec (format #f "-j~a" + (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (with-directory-excursion "mrustc" + (substitute* '("minicargo.mk" + "run_rustc/Makefile") + ;; Use the system-provided LLVM. + (("LLVM_CONFIG := .*") + (string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n")) + (("\\$\\(LLVM_CONFIG\\): .*") + "$(LLVM_CONFIG):\n") + (("\\$Vcd \\$\\(RUSTCSRC\\)build && \\$\\(MAKE\\).*") + "true\n")) + ;; Patch date. + (substitute* "Makefile" + (("shell date") + "shell date -d @1")) + (substitute* "run_rustc/Makefile" + (("[$]Vtime ") + "$V ") + ;; Unlock the number of parallel jobs for cargo. + (("-j [[:digit:]]+ ") + "") + ;; Patch the shebang of a generated wrapper for rustc, and + ;; make sure that \n newline escapes get interpreted + ;; correctly, specifying the '-e' option of echo. + (("echo '#!/bin/sh") + (string-append "echo -e '#!" (which "sh")))))))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda* _ - (use-modules (guix build cargo-utils)) (substitute* "src/Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) - (generate-all-checksums "src/vendor") - #t)) - ;; This phase is overridden by newer versions. + (generate-all-checksums "src/vendor"))) (replace 'configure - (const #t)) - ;; This phase is overridden by newer versions. + (lambda _ + (setenv "CC" "gcc") + (setenv "CXX" "g++") + ;; The Guix LLVM package installs only shared libraries. + (setenv "LLVM_LINK_SHARED" "1") + ;; This is a workaround for + ;; https://github.com/thepowersgang/mrustc/issues/138. + (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "yes"))) + (delete 'patch-generated-file-shebangs) (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((rustc-bootstrap (assoc-ref inputs "rustc-bootstrap"))) - (setenv "CFG_COMPILER_HOST_TRIPLE" - ,(nix-system->gnu-triplet (%current-system))) - (setenv "CFG_RELEASE" "") - (setenv "CFG_RELEASE_CHANNEL" "stable") - (setenv "CFG_LIBDIR_RELATIVE" "lib") - (setenv "CFG_VERSION" "1.19.0-stable-mrustc") - (setenv "MRUSTC_TARGET_VER" ,(version-major+minor version)) - ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. - (mkdir-p "output") - ;; mrustc 0.9 doesn't check the search paths for crates anymore. - (copy-recursively (string-append rustc-bootstrap "/lib/mrust") - "output") - (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") - "src/rustc" "--vendor-dir" "src/vendor" - "--output-dir" "output/rustc-build" - "-L" (string-append rustc-bootstrap "/lib/mrust") - "-j" "1") - (setenv "CFG_COMPILER_HOST_TRIPLE" #f) - (setenv "CFG_RELEASE" #f) - (setenv "CFG_RELEASE_CHANNEL" #f) - (setenv "CFG_VERSION" #f) - (setenv "CFG_PREFIX" #f) - (setenv "CFG_LIBDIR_RELATIVE" #f) - (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") - "src/tools/cargo" "--vendor-dir" "src/vendor" - "--output-dir" "output/cargo-build" - "-L" "output/" - "-L" (string-append rustc-bootstrap "/lib/mrust") - "-j" "1") - ;; Now use the newly-built rustc to build the libraries. - ;; One day that could be replaced by: - ;; (invoke "output/cargo-build/cargo" "build" - ;; "--manifest-path" "src/bootstrap/Cargo.toml" - ;; "--verbose") ; "--locked" "--frozen" - ;; but right now, Cargo has problems with libstd's circular - ;; dependencies. - (mkdir-p "output/target-libs") - (for-each (match-lambda - ((name . flags) - (write name) - (newline) - (apply invoke - "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" - (string-append "output/target-libs/" - (car (string-split name #\/)) - ".rlib") - flags))) - '(("libcore") - ("libstd_unicode") - ("liballoc") - ("libcollections") - ("librand") - ("liblibc/src" "--cfg" "stdbuild") - ("libunwind" "-l" "gcc_s") - ("libcompiler_builtins") - ("liballoc_system") - ("libpanic_unwind") - ;; Uses "cc" to link. - ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") - ("libarena") - - ;; Test dependencies: - - ("libgetopts") - ("libterm") - ("libtest"))) - #t))) - ;; This phase is overridden by newer versions. - (replace 'check - (const #t)) - ;; This phase is overridden by newer versions. + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (let* ((job-count (if parallel-build? + (parallel-job-count) + 1)) + (job-spec (string-append "-j" (number->string job-count))) + (make-flags* (cons job-spec make-flags))) + ;; Adapted from: + ;; https://github.com/dtolnay/bootstrap/blob/master/build.sh. + (chdir "mrustc") + (setenv "MINICARGO_FLAGS" job-spec) + (setenv "CARGO_BUILD_JOBS" (number->string job-count)) + (display "Building rustc...\n") + (apply invoke "make" "-f" "minicargo.mk" "output/rustc" + make-flags*) + (display "Building cargo...\n") + (apply invoke "make" "-f" "minicargo.mk" "output/cargo" + make-flags*) + (display "Rebuilding stdlib with rustc...\n") + (with-directory-excursion "run_rustc" + (apply invoke "make" "RUST_SRC=../../src/" make-flags*))))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (target-system ,(or (%current-target-system) - (nix-system->gnu-triplet - (%current-system)))) - (out-libs (string-append out "/lib/rustlib/" - target-system "/lib"))) - ;(setenv "CFG_PREFIX" out) - (mkdir-p out-libs) - (copy-recursively "output/target-libs" out-libs) - (install-file "output/rustc-build/rustc" - (string-append out "/bin")) - (install-file "output/rustc-build/rustdoc" - (string-append out "/bin")) - (install-file "output/cargo-build/cargo" - (string-append (assoc-ref outputs "cargo") - "/bin"))) - #t))))) - (build-system gnu-build-system) - (native-inputs - `(("bison" ,bison) ; For the tests - ("cmake" ,cmake-minimal) - ("flex" ,flex) ; For the tests - ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. - ;; See <https://bugs.gnu.org/37810>. 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) - ("cargo-bootstrap" ,mrustc "cargo") - ("pkg-config" ,pkg-config) ; For "cargo" - ("which" ,which))) - (inputs - `(("jemalloc" ,jemalloc-4.5.0) - ("llvm" ,llvm-3.9.1) - ("openssl" ,openssl-1.0) - ("libssh2" ,libssh2) ; For "cargo" - ("libcurl" ,curl))) ; For "cargo" - - ;; rustc invokes gcc, so we need to set its search paths accordingly. - ;; Note: duplicate its value here to cope with circular dependencies among - ;; modules (see <https://bugs.gnu.org/31392>). - (native-search-paths - (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include/c++" "include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - - (supported-systems - (delete "i686-linux" ; fails to build, see #35519 - %supported-systems)) + (cargo (assoc-ref outputs "cargo")) + (bin (string-append out "/bin")) + (rustc (string-append bin "/rustc")) + (cargo-bin (string-append cargo "/bin")) + (lib (string-append out "/lib")) + (gnu-triplet ,(or (%current-target-system) + (nix-system->gnu-triplet-for-rust))) + (system-lib-prefix (string-append lib "/rustlib/" + gnu-triplet "/lib"))) + (mkdir-p (dirname rustc)) + (copy-file "run_rustc/output/prefix/bin/rustc_binary" rustc) + (wrap-program rustc + `("LD_LIBRARY_PATH" = (,system-lib-prefix))) + (mkdir-p lib) + (copy-recursively "run_rustc/output/prefix/lib" lib) + (install-file "run_rustc/output/prefix/bin/cargo" cargo-bin))))))) (synopsis "Compiler for the Rust programming language") (description "Rust is a systems programming language that provides memory safety and thread safety guarantees.") - (home-page "https://www.rust-lang.org") + (home-page "https://github.com/thepowersgang/mrustc") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-1.20 - (let ((base-rust - (rust-bootstrapped-package rust-1.19 "1.20.0" - "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (snippet '(begin - (delete-file-recursively "src/jemalloc") - (delete-file-recursively "src/llvm") - #t)) - (patches '()))) - (native-inputs - `(;; The tests fail with newer versions of GNU Make. - ("make" ,gnu-make-4.2) - ,@(package-native-inputs base-rust))) - (outputs '("out" "doc" "cargo")) - ;; Since rust-1.19 is local, it's quite probable that Hydra - ;; will build rust-1.19 only as a dependency of rust-1.20. - ;; But then Hydra will use the wrong properties, the ones here, - ;; for rust-1.19. Therefore, we copied the properties of - ;; rust-1.19 here. - (properties '((timeout . 72000) ;20 hours - (max-silent-time . 18000))) ;5 hours (for armel) - (arguments - (substitute-keyword-arguments (package-arguments rust-1.19) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-tests 'patch-cargo-tests - (lambda _ - (substitute* "src/tools/cargo/tests/build.rs" - (("/usr/bin/env") (which "env")) - ;; Guix llvm is compiled without asmjs-unknown-emscripten. - (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) - (substitute* "src/tools/cargo/tests/death.rs" - ;; This is stuck when built in container. - (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) - ;; Prints test output in the wrong order when built on - ;; i686-linux. - (substitute* "src/tools/cargo/tests/test.rs" - (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) - - ;; These tests pull in a dependency on "git", which changes - ;; too frequently take part in the Rust toolchain. - (substitute* "src/tools/cargo/tests/new.rs" - (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") - (("fn finds_author_git") "#[ignore]\nfn finds_author_git") - (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) - #t)) - (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test - ;; https://github.com/rust-lang/rust/issues/47863 - (lambda _ - (substitute* "src/test/run-pass/out-of-stack.rs" - (("// ignore-android") "// ignore-test\n// ignore-android")) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (gcc (assoc-ref inputs "gcc")) - (gdb (assoc-ref inputs "gdb")) - (binutils (assoc-ref inputs "binutils")) - (python (assoc-ref inputs "python-2")) - (rustc (assoc-ref inputs "rustc-bootstrap")) - (cargo (assoc-ref inputs "cargo-bootstrap")) - (llvm (assoc-ref inputs "llvm")) - (jemalloc (assoc-ref inputs "jemalloc"))) - (call-with-output-file "config.toml" - (lambda (port) - (display (string-append " +(define-public rust-1.30 + (package + (name "rust") + (version "1.30.1") + (source (origin + (inherit (package-source rust-1.29)) + (uri (rust-uri version)) + (sha256 + (base32 "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn")) + (snippet '(for-each delete-file-recursively + '("src/jemalloc" + "src/llvm" + "src/llvm-emscripten" + "src/tools/clang" + "src/tools/lldb"))))) + (outputs '("out" "cargo")) + (properties '((timeout . 72000) ;20 hours + (max-silent-time . 18000))) ;5 hours (for armel) + (build-system gnu-build-system) + (arguments + ;; Only the final Rust is tested, not the intermediate bootstrap ones, + ;; for performance and simplicity. + `(#:tests? #f + #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' + #:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 match) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + ;; The Guix LLVM package installs only shared libraries. + (setenv "LLVM_LINK_SHARED" "1"))) + (add-after 'unpack 'neuter-tidy + ;; We often need to patch tests with various Guix-specific paths. + ;; This often increases the line length and makes tidy, rustc's + ;; style checker, complain. We could insert additional newlines or + ;; add an "// ignore-tidy-linelength" comment, but as an ignore + ;; comment must be used, both approaches are fragile due to + ;; upstream formatting changes. As such, disable running the + ;; linter during tests, since it's intended for rustc developers + ;; anyway. + (lambda _ + (substitute* "src/bootstrap/builder.rs" + ((".*::Tidy,.*") + "")))) + (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums + (lambda* _ + (use-modules (guix build cargo-utils)) + (substitute* "src/Cargo.lock" + (("(\"checksum .* = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "src/vendor"))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gcc (assoc-ref inputs "gcc")) + (python (assoc-ref inputs "python")) + (binutils (assoc-ref inputs "binutils")) + (rustc (assoc-ref inputs "rustc-bootstrap")) + (cargo (assoc-ref inputs "cargo-bootstrap")) + (llvm (assoc-ref inputs "llvm")) + (jemalloc (assoc-ref inputs "jemalloc"))) + (call-with-output-file "config.toml" + (lambda (port) + (display (string-append " [llvm] [build] cargo = \"" cargo "/bin/cargo" "\" rustc = \"" rustc "/bin/rustc" "\" -docs = true -python = \"" python "/bin/python2" "\" -gdb = \"" gdb "/bin/gdb" "\" +docs = false +python = \"" python "/bin/python" "\" vendor = true submodules = false [install] prefix = \"" out "\" -docdir = \"" doc "/share/doc/rust" "\" sysconfdir = \"etc\" [rust] default-linker = \"" gcc "/bin/gcc" "\" channel = \"stable\" rpath = true -" ;; There are 2 failed codegen tests: -;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs -;; These tests require a patched LLVM -"codegen-tests = false [target." ,(nix-system->gnu-triplet-for-rust) "] llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" @@ -563,473 +383,110 @@ cxx = \"" gcc "/bin/g++" "\" ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] -") port))) - #t))) - (add-after 'configure 'provide-cc - (lambda* (#:key inputs #:allow-other-keys) - (symlink (string-append (assoc-ref inputs "gcc") "/bin/gcc") - "/tmp/cc") - (setenv "PATH" (string-append "/tmp:" (getenv "PATH"))) - #t)) - (add-after 'provide-cc 'configure-archiver - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/build_helper/lib.rs" - ;; Make sure "ar" is always used as the archiver. - (("\"musl\"") "\"\"") - ;; Then substitute "ar" by our name. - (("\"ar\"") (string-append "\"" - (assoc-ref inputs "binutils") - "/bin/ar\""))) - #t)) - (delete 'patch-cargo-tomls) - (add-before 'build 'reset-timestamps-after-changes - (lambda* _ - (for-each - (lambda (filename) - ;; Rust 1.20.0 treats timestamp 0 as "file doesn't exist". - ;; Therefore, use timestamp 1. - (utime filename 1 1 1 1)) - (find-files "." #:directories? #t)) - #t)) - (replace 'build - (lambda* _ - (invoke "./x.py" "build") - (invoke "./x.py" "build" "src/tools/cargo"))) - (replace 'check - (lambda* _ - ;; Disable parallel execution to prevent EAGAIN errors when - ;; running tests. - (invoke "./x.py" "-j1" "test" "-vv") - (invoke "./x.py" "-j1" "test" "src/tools/cargo") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./x.py" "install") - (substitute* "config.toml" - ;; replace prefix to specific output - (("prefix = \"[^\"]*\"") - (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) - (invoke "./x.py" "install" "cargo"))) - (add-after 'install 'delete-install-logs - (lambda* (#:key outputs #:allow-other-keys) - (define (delete-manifest-file out-path file) - (delete-file (string-append out-path "/lib/rustlib/" file))) - - (let ((out (assoc-ref outputs "out")) - (cargo-out (assoc-ref outputs "cargo"))) - (for-each - (lambda (file) (delete-manifest-file out file)) - '("install.log" - "manifest-rust-docs" - ,(string-append "manifest-rust-std-" - (nix-system->gnu-triplet-for-rust)) - "manifest-rustc")) - (for-each - (lambda (file) (delete-manifest-file cargo-out file)) - '("install.log" - "manifest-cargo")) - #t))) - (add-after 'install 'wrap-rustc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) - (ld-wrapper (assoc-ref inputs "ld-wrapper"))) - ;; Let gcc find ld and libc startup files. - (wrap-program (string-append out "/bin/rustc") - `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) - `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) - #t)))))))))) - -(define-public rust-1.21 - (let ((base-rust (rust-bootstrapped-package rust-1.20 "1.21.0" - "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'configure 'remove-ar - (lambda* (#:key inputs #:allow-other-keys) - ;; Remove because toml complains about "unknown field". - (substitute* "config.toml" - (("^ar =.*") "\n")) - #t))))))))) - -(define-public rust-1.22 - (let ((base-rust (rust-bootstrapped-package rust-1.21 "1.22.1" - "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'remove-flaky-test - (lambda _ - ;; See <https://github.com/rust-lang/rust/issues/43402>. - (when (file-exists? "src/test/run-make/issue-26092") - (delete-file-recursively "src/test/run-make/issue-26092")) - #t))))))))) - -(define-public rust-1.23 - (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0" - "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (delete 'configure-archiver) - (delete 'remove-ar) - (add-after 'unpack 'dont-build-native - (lambda _ - ;; XXX: Revisit this when we use gcc 6. - (substitute* "src/binaryen/CMakeLists.txt" - (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t))))))))) - -(define-public rust-1.24 - (let ((base-rust - (rust-bootstrapped-package rust-1.23 "1.24.1" - "1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (delete 'use-readelf-for-tests) - (replace 'patch-aarch64-test - (lambda* _ - (substitute* "src/librustc_metadata/dynamic_lib.rs" - ;; This test is known to fail on aarch64 and powerpc64le: - ;; https://github.com/rust-lang/rust/issues/45410 - (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) - #t))))))))) - -;;; Rust 1.25 release support work with llvm 6--but build with llvm 6 is -;;; not determenistic due to <https://github.com/rust-lang/rust/issues/50556>. -;;; Keep using llvm 3.9.1 until builds become determenistic -(define-public rust-1.25 - (let ((base-rust - (rust-bootstrapped-package rust-1.24 "1.25.0" - "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (snippet '(begin - (delete-file-recursively "src/jemalloc") - (delete-file-recursively "src/llvm") - (delete-file-recursively "src/llvm-emscripten") - #t)) - (patches (search-patches - "rust-1.25-accept-more-detailed-gdb-lines.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-cargo-tests 'patch-cargo-index-update - (lambda _ - (substitute* "src/tools/cargo/tests/generate-lockfile.rs" - ;; This test wants to update the crate index. - (("fn no_index_update") "#[ignore]\nfn no_index_update")) - #t)) - (replace 'patch-aarch64-test - (lambda _ - (substitute* "src/librustc_metadata/dynamic_lib.rs" - ;; This test is known to fail on aarch64 and powerpc64le: - ;; https://github.com/rust-lang/rust/issues/45410 - (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) - ;; This test fails on aarch64 with llvm@6.0: - ;; https://github.com/rust-lang/rust/issues/49807 - ;; other possible solution: - ;; https://github.com/rust-lang/rust/pull/47688 - (delete-file "src/test/debuginfo/by-value-self-argument-in-trait-impl.rs") - #t)) - (delete 'ignore-glibc-2.27-incompatible-test)))))))) - -(define-public rust-1.26 - (let ((base-rust - (rust-bootstrapped-package rust-1.25 "1.26.2" - "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (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) - `(modify-phases ,phases - ;; binaryen was replaced with LLD project from LLVM - (delete 'dont-build-native) - (replace 'check - (lambda* _ - ;; Enable parallel execution. - (let ((parallel-job-spec - (string-append "-j" (number->string - (min 4 - (parallel-job-count)))))) - (invoke "./x.py" parallel-job-spec "test" "-vv") - (invoke "./x.py" parallel-job-spec "test" - "src/tools/cargo")))) - (replace 'remove-unsupported-tests - (lambda* _ - ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00193.html> - (delete-file-recursively "src/test/run-make-fulldeps/linker-output-non-utf8") - #t)) - (replace 'patch-cargo-tests - (lambda* _ - (substitute* "src/tools/cargo/tests/testsuite/build.rs" - (("/usr/bin/env") (which "env")) - ;; Guix llvm is compiled without asmjs-unknown-emscripten. - (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) - (substitute* "src/tools/cargo/tests/testsuite/death.rs" - ;; This is stuck when built in container. - (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) - ;; Prints test output in the wrong order when built on - ;; i686-linux. - (substitute* "src/tools/cargo/tests/testsuite/test.rs" - (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) - - ;; Avoid dependency on "git". - (substitute* "src/tools/cargo/tests/testsuite/new.rs" - (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") - (("fn finds_author_git") "#[ignore]\nfn finds_author_git") - (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) - #t)) - (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel - (lambda* _ - ;; This test failed to work on "nightly" channel builds - ;; https://github.com/rust-lang/cargo/issues/5648 - (substitute* "src/tools/cargo/tests/testsuite/resolve.rs" - (("fn test_resolving_minimum_version_with_transitive_deps") - "#[ignore]\nfn test_resolving_minimum_version_with_transitive_deps")) - #t)) - (replace 'patch-cargo-index-update - (lambda* _ - (substitute* "src/tools/cargo/tests/testsuite/generate_lockfile.rs" - ;; This test wants to update the crate index. - (("fn no_index_update") "#[ignore]\nfn no_index_update")) - #t)))))) - (supported-systems - (delete "aarch64-linux" ; fails to build, see #47019 - (package-supported-systems base-rust)))))) - -(define-public rust-1.27 - (let ((base-rust - (rust-bootstrapped-package rust-1.26 "1.27.2" - "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (patches (search-patches "rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'install 'mkdir-prefix-paths - (lambda* (#:key outputs #:allow-other-keys) - ;; As result of https://github.com/rust-lang/rust/issues/36989 - ;; `prefix' directory should exist before `install' call - (mkdir-p (assoc-ref outputs "out")) - (mkdir-p (assoc-ref outputs "cargo")) - #t)) - (add-after 'patch-cargo-tests 'disable-thinlto-test - (lambda* _ - ;; thinlto required llvm 6.0 for work - (substitute* "src/tools/cargo/tests/testsuite/path.rs" - (("fn thin_lto_works") "#[ignore]\nfn thin_lto_works")) - #t))))))))) - -(define-public rust-1.28 - (let ((base-rust - (rust-bootstrapped-package rust-1.27 "1.28.0" - "11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (patches (search-patches "rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch")))) - (inputs - ;; Use LLVM 6.0 - (alist-replace "llvm" (list llvm-6) - (package-inputs base-rust))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'configure 'enable-codegen-tests - ;; Codegen tests should pass with llvm 6, so enable them. - (lambda* _ - (substitute* "config.toml" - (("codegen-tests = false") "")) - #t)) - (add-after 'patch-tests 'disable-amd64-avx-test - ;; That test would fail on x86_64 machines without avx. - (lambda* _ - (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)))))))) - -(define-public rust-1.29 - (let ((base-rust - (rust-bootstrapped-package rust-1.28 "1.29.2" - "1jb787080z754caa2w3w1amsygs4qlzj9rs1vy64firfmabfg22h"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (patches (search-patches "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch"))))))) - -(define-public rust-1.30 - (let ((base-rust - (rust-bootstrapped-package rust-1.29 "1.30.1" - "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn"))) - (package - (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (snippet '(begin - (delete-file-recursively "src/jemalloc") - (delete-file-recursively "src/llvm") - (delete-file-recursively "src/llvm-emscripten") - (delete-file-recursively "src/tools/clang") - (delete-file-recursively "src/tools/lldb") - #t)))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-cargo-tests 'patch-cargo-env-shebang - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "src/tools/cargo/tests/testsuite/fix.rs" - ;; Cargo has a test which explicitly sets a - ;; RUSTC_WRAPPER environment variable which points - ;; to /usr/bin/env. Since it's not a shebang, it - ;; needs to be manually patched - (("\"/usr/bin/env\"") - (string-append "\"" coreutils "/bin/env\""))) - #t))) - (add-after 'patch-cargo-env-shebang 'ignore-cargo-package-tests - (lambda* _ - (substitute* "src/tools/cargo/tests/testsuite/package.rs" - ;; These tests largely check that cargo outputs warning/error - ;; messages as expected. It seems that cargo outputs an - ;; absolute path to something in the store instead of the - ;; expected relative path (e.g. `[..]`) so we'll ignore - ;; these for now - (("fn include") "#[ignore]\nfn include") - (("fn exclude") "#[ignore]\nfn exclude")) - #t)) - ;; The test has been moved elsewhere. - (replace 'disable-amd64-avx-test - (lambda _ - (substitute* "src/test/ui/run-pass/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) - #t))))))))) - -(define (patch-command-exec-tests-phase test-path) - "The command-exec.rs test moves around between releases. We need to apply -a Guix-specific patch to it for each release. This function generates the phase -that applies said patch, parametrized by the test-path. This is done this way -because the phase is more complex than the equivalents for other tests that -move around." - `(lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* ,test-path - ;; This test suite includes some tests that the stdlib's - ;; `Command` execution properly handles situations where - ;; the environment or PATH variable are empty, but this - ;; fails since we don't have `echo` available in the usual - ;; Linux directories. - ;; NB: the leading space is so we don't fail a tidy check - ;; for trailing whitespace, and the newlines are to ensure - ;; we don't exceed the 100 chars tidy check as well - ((" Command::new\\(\"echo\"\\)") - (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) - #t))) +") port)))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (let ((job-spec (string-append + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (invoke "./x.py" job-spec "build") + (invoke "./x.py" job-spec "build" "src/tools/cargo")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (cargo-out (assoc-ref outputs "cargo"))) + (mkdir-p out) + (invoke "./x.py" "install") + (substitute* "config.toml" + ;; Adjust the prefix to the 'cargo' output. + (("prefix = \"[^\"]*\"") + (format #f "prefix = ~s" cargo-out))) + (mkdir-p cargo-out) + (invoke "./x.py" "install" "cargo")))) + (add-after 'install 'delete-install-logs + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (f) + (false-if-exception (delete-file f))) + (append-map (lambda (output) + (find-files (string-append + output "/lib/rustlib") + "(^install.log$|^manifest-)")) + (map cdr outputs))))) + (add-after 'install 'wrap-rustc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libc (assoc-ref inputs "libc")) + (ld-wrapper (assoc-ref inputs "ld-wrapper"))) + ;; Let gcc find ld and libc startup files. + (wrap-program (string-append out "/bin/rustc") + `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) + `("LIBRARY_PATH" ":" + suffix (,(string-append libc "/lib")))))))))) + (native-inputs + `(("cmake" ,cmake-minimal) + ("pkg-config" ,pkg-config) ; For "cargo" + ("python" ,python-wrapper) + ("rustc-bootstrap" ,rust-1.29) + ("cargo-bootstrap" ,rust-1.29 "cargo") + ("which" ,which))) + (inputs + `(("jemalloc" ,jemalloc-4.5.0) + ("llvm" ,llvm-7) + ("openssl" ,openssl) + ("libssh2" ,libssh2) ; For "cargo" + ("libcurl" ,curl))) ; For "cargo" + ;; rustc invokes gcc, so we need to set its search paths accordingly. + ;; Note: duplicate its value here to cope with circular dependencies among + ;; modules (see <https://bugs.gnu.org/31392>). + (native-search-paths + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (supported-systems + (delete "i686-linux" ; fails to build, see bug #35519 + %supported-systems)) + (synopsis "Compiler for the Rust progamming language") + (description "Rust is a systems programming language that provides memory +safety and thread safety guarantees.") + (home-page "https://www.rust-lang.org") + ;; Dual licensed. + (license (list license:asl2.0 license:expat)))) (define-public rust-1.31 - (let ((base-rust - (rust-bootstrapped-package rust-1.30 "1.31.1" - "0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-tests 'patch-command-exec-tests - ,(patch-command-exec-tests-phase - "src/test/run-pass/command-exec.rs")) - ;; The test has been moved elsewhere. - (replace 'disable-amd64-avx-test - (lambda _ - (substitute* "src/test/ui/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) - #t)) - (add-after 'patch-tests 'patch-process-docs-rev-cmd - (lambda* _ - ;; Disable some doc tests which depend on the "rev" command - ;; https://github.com/rust-lang/rust/pull/58746 - (substitute* "src/libstd/process.rs" - (("```rust") "```rust,no_run")) - #t))))))))) + (rust-bootstrapped-package + rust-1.30 "1.31.1" "0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli")) (define-public rust-1.32 - (let ((base-rust - (rust-bootstrapped-package rust-1.31 "1.32.0" - "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.31 "1.32.0" + "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"))) (package (inherit base-rust) (source - (origin - (inherit (package-source base-rust)) - (snippet '(begin (delete-file-recursively "src/llvm") - (delete-file-recursively "src/llvm-emscripten") - (delete-file-recursively "src/tools/clang") - (delete-file-recursively "src/tools/lldb") - (delete-file-recursively "vendor/jemalloc-sys/jemalloc") - #t)) - (patches (search-patches "rust-reproducible-builds.patch")) + (origin + (inherit (package-source base-rust)) + (snippet '(for-each delete-file-recursively + '("src/llvm" + "src/llvm-emscripten" + "src/tools/clang" + "src/tools/lldb" + "vendor/jemalloc-sys/jemalloc"))) ;; the vendor directory has moved to the root of ;; the tarball, so we have to strip an extra prefix - (patch-flags '("-p2")))) - (inputs - ;; Downgrade to LLVM 6, all LTO tests appear to fail with LLVM 7.0.1 - (alist-replace "llvm" (list llvm-6) - (package-inputs base-rust))) + (patch-flags '("-p2")))) (arguments (substitute-keyword-arguments (package-arguments base-rust) + ;; The test suite fails due to LLVM 7, required for the build to be + ;; reproducible. + ((#:tests? _ #t) + #f) ((#:phases phases) `(modify-phases ,phases ;; Cargo.lock and the vendor/ directory have been moved to the @@ -1040,9 +497,8 @@ move around." (substitute* "Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) - (generate-all-checksums "vendor") - #t)) - (add-after 'enable-codegen-tests 'override-jemalloc + (generate-all-checksums "vendor"))) + (add-after 'configure 'override-jemalloc (lambda* (#:key inputs #:allow-other-keys) ;; The compiler is no longer directly built against jemalloc, ;; but rather via the jemalloc-sys crate (which vendors the @@ -1052,96 +508,59 @@ move around." (substitute* "config.toml" (("^jemalloc =.*$") "") (("[[]rust[]]") "\n[rust]\njemalloc=true\n")) - (setenv "JEMALLOC_OVERRIDE" (string-append (assoc-ref inputs "jemalloc") - "/lib/libjemalloc_pic.a")) - #t)) - ;; Remove no longer relevant steps - (delete 'remove-flaky-test) - (delete 'patch-aarch64-test)))))))) + (setenv "JEMALLOC_OVERRIDE" + (string-append (assoc-ref inputs "jemalloc") + "/lib/libjemalloc_pic.a"))))))))))) (define-public rust-1.33 - (let ((base-rust - (rust-bootstrapped-package rust-1.32 "1.33.0" - "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.32 "1.33.0" + "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"))) (package (inherit base-rust) (source - (origin - (inherit (package-source base-rust)) - (patches '()) - (patch-flags '("-p1")))) + (origin + (inherit (package-source base-rust)) + (patches '()) + (patch-flags '("-p1")))) (inputs - ;; Upgrade to jemalloc@5.1.0 - (alist-replace "jemalloc" (list jemalloc) - (package-inputs base-rust))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (delete 'ignore-cargo-package-tests) - (add-after 'configure 'configure-test-threads - ;; Several rustc and cargo tests will fail if run on one core - ;; https://github.com/rust-lang/rust/issues/59122 - ;; https://github.com/rust-lang/cargo/issues/6746 - ;; https://github.com/rust-lang/rust/issues/58907 - (lambda* (#:key inputs #:allow-other-keys) - (setenv "RUST_TEST_THREADS" "2") - #t))))))))) + ;; Upgrade jemalloc. + (alist-replace "jemalloc" (list jemalloc) (package-inputs base-rust)))))) (define-public rust-1.34 - (let ((base-rust - (rust-bootstrapped-package rust-1.33 "1.34.1" - "19s09k7y5j6g3y4d2rk6kg9pvq6ml94c49w6b72dmq8p9lk8bixh"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.33 "1.34.1" + "19s09k7y5j6g3y4d2rk6kg9pvq6ml94c49w6b72dmq8p9lk8bixh"))) (package (inherit base-rust) (source - (origin - (inherit (package-source base-rust)) - (snippet '(begin - (delete-file-recursively "src/llvm-emscripten") - (delete-file-recursively "src/llvm-project") - (delete-file-recursively "vendor/jemalloc-sys/jemalloc") - #t))))))) + (origin + (inherit (package-source base-rust)) + (snippet '(for-each delete-file-recursively + '("src/llvm-emscripten" + "src/llvm-project" + "vendor/jemalloc-sys/jemalloc")))))))) (define-public rust-1.35 - (let ((base-rust - (rust-bootstrapped-package rust-1.34 "1.35.0" - "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.34 "1.35.0" + "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) `(modify-phases ,phases - ;; The tidy test includes a pass which ensures large binaries - ;; don't accidentally get checked into the rust git repo. - ;; Unfortunately the test assumes that git is always available, - ;; so we'll comment out the invocation of this pass. - (add-after 'configure 'disable-tidy-bins-check - (lambda* _ - (substitute* "src/tools/tidy/src/main.rs" - (("bins::check") "//bins::check")) - #t))))))))) + (delete 'disable-codegen-tests)))))))) (define-public rust-1.36 - (let ((base-rust - (rust-bootstrapped-package rust-1.35 "1.36.0" - "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"))) - (package - (inherit base-rust) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (delete 'patch-process-docs-rev-cmd)))))))) + (rust-bootstrapped-package + rust-1.35 "1.36.0" "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04")) (define-public rust-1.37 - (let ((base-rust - (rust-bootstrapped-package rust-1.36 "1.37.0" - "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.36 "1.37.0" + "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) (package (inherit base-rust) (arguments @@ -1152,36 +571,16 @@ move around." (lambda _ (let ((cargo-home (string-append (getcwd) "/.cargo"))) (mkdir-p cargo-home) - (setenv "CARGO_HOME" cargo-home) - #t)))))))))) + (setenv "CARGO_HOME" cargo-home))))))))))) (define-public rust-1.38 - (let ((base-rust - (rust-bootstrapped-package rust-1.37 "1.38.0" - "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))) - (package - (inherit base-rust) - (inputs - (alist-replace "llvm" (list llvm-9) - (package-inputs base-rust))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - (replace 'patch-command-exec-tests - ,(patch-command-exec-tests-phase - "src/test/ui/command-exec.rs")) - (add-after 'patch-tests 'patch-command-uid-gid-test - (lambda _ - (substitute* "src/test/ui/command-uid-gid.rs" - (("/bin/sh") (which "sh")) - (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) - #t))))))))) + (rust-bootstrapped-package + rust-1.37 "1.38.0" "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4")) (define-public rust-1.39 - (let ((base-rust - (rust-bootstrapped-package rust-1.38 "1.39.0" - "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.38 "1.39.0" + "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"))) (package (inherit base-rust) (arguments @@ -1195,136 +594,85 @@ move around." (substitute* "Cargo.lock" (("(checksum = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) - (generate-all-checksums "vendor") - #t))))))))) + (generate-all-checksums "vendor")))))))))) (define-public rust-1.40 - (let ((base-rust - (rust-bootstrapped-package rust-1.39 "1.40.0" - "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.39 "1.40.0" + "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"))) (package (inherit base-rust) (source - (origin - (inherit (package-source base-rust)) - ;; llvm-emscripten is no longer bundled, as that codegen backend - ;; got removed. - (snippet '(begin - (delete-file-recursively "src/llvm-project") - (delete-file-recursively "vendor/jemalloc-sys/jemalloc") - #t)))) - (arguments - ;; Rust 1.40 does not ship rustc-internal libraries by default - ;; (see rustc-dev-split). This means that librustc_driver.so is no - ;; longer available in lib/rustlib/$target/lib, which is the directory - ;; included in the runpath of librustc_codegen_llvm-llvm.so. - ;; This is detected by our validate-runpath phase as an error, but it - ;; is harmless as the codegen backend is loaded by librustc_driver.so - ;; itself, which must at that point have been already loaded. - ;; As such, we skip validating the runpath for Rust 1.40. - ;; Rust 1.41 stopped putting the codegen backend in a separate library, - ;; which makes this workaround only necessary for this release. - (cons* #:validate-runpath? #f - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - ;; We often need to patch tests with various Guix-specific paths. - ;; This often increases the line length and makes tidy, rustc's - ;; style checker, complain. We could insert additional newlines - ;; or add an "// ignore-tidy-linelength" comment, but as an - ;; ignore comment must be used, both approaches are fragile due - ;; to upstream formatting changes. As such, disable running the - ;; linter during tests, since it's intended for rustc developers - ;; anyway. - ;; - ;; TODO(rebuild-rust): This phase could be added earlier to - ;; simplify a significant amount of code, but it would require - ;; rebuilding the entire rusty universe. - (add-after 'patch-tests 'neuter-tidy - (lambda _ - (substitute* "src/bootstrap/builder.rs" - (("^.*::Tidy,") "")) - #t)) - ;; TODO(rebuild-rust): Adapt the find-files approach for - ;; earlier testsuite patches. - (replace 'patch-command-uid-gid-test - (lambda _ - (match (find-files "src/test" "command-uid-gid\\.rs") - ((file) - (substitute* file - (("/bin/sh") (which "sh"))))) - #t)) - (replace 'patch-command-exec-tests - ,(patch-command-exec-tests-phase - '(match (find-files "src/test" "command-exec\\.rs") - ((file) file)))) - ;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15 - ;; "Remove painful test that is not pulling its weight" - (delete 'remove-unsupported-tests))))))))) + (origin + (inherit (package-source base-rust)) + ;; llvm-emscripten is no longer bundled, as that codegen backend + ;; got removed. + (snippet '(for-each delete-file-recursively + '("src/llvm-project" + "vendor/jemalloc-sys/jemalloc"))))) + ;; Rust 1.40 does not ship rustc-internal libraries by default (see + ;; rustc-dev-split). This means that librustc_driver.so is no longer + ;; available in lib/rustlib/$target/lib, which is the directory + ;; included in the runpath of librustc_codegen_llvm-llvm.so. This is + ;; detected by our validate-runpath phase as an error, but it is + ;; harmless as the codegen backend is loaded by librustc_driver.so + ;; itself, which must at that point have been already loaded. As such, + ;; we skip validating the runpath for Rust 1.40. Rust 1.41 stopped + ;; putting the codegen backend in a separate library, which makes this + ;; workaround only necessary for this release. + (arguments (substitute-keyword-arguments (package-arguments base-rust) + ((#:validate-runpath? _ #f) + #f)))))) (define-public rust-1.41 - (let ((base-rust - (rust-bootstrapped-package rust-1.40 "1.41.1" - "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.40 "1.41.1" + "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q"))) (package (inherit base-rust) (arguments (substitute-keyword-arguments (package-arguments base-rust) - ((#:validate-runpath? _) #t)))))) + ((#:validate-runpath? _ #t) + #t)))))) (define-public rust-1.42 - (rust-bootstrapped-package rust-1.41 "1.42.0" - "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j")) + (rust-bootstrapped-package + rust-1.41 "1.42.0" "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j")) (define-public rust-1.43 - (rust-bootstrapped-package rust-1.42 "1.43.0" - "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm")) + (rust-bootstrapped-package + rust-1.42 "1.43.0" "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm")) +;; This version needs llvm >= 8.0 and NOT 11 (define-public rust-1.44 - (rust-bootstrapped-package rust-1.43 "1.44.1" - "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky")) + (let ((base-rust (rust-bootstrapped-package + rust-1.43 "1.44.1" + "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"))) + (package + (inherit base-rust) + (inputs + (alist-replace "llvm" (list llvm-10) (package-inputs base-rust)))))) (define-public rust-1.45 - (let ((base-rust - (rust-bootstrapped-package rust-1.44 "1.45.2" - "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.44 "1.45.2" + "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"))) (package (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - (patches (search-patches "rust-1.45-linker-locale.patch")))) - (inputs - (alist-replace "llvm" (list llvm-10) - (package-inputs base-rust))) (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - ;; These tests make sure that the parser behaves properly when - ;; a source file starts with a shebang. Unfortunately, - ;; the patch-shebangs phase changes the meaning of these edge-cases. - ;; We skip the test since it's drastically unlikely Guix's packaging - ;; will introduce a bug here. - (add-after 'patch-tests 'skip-shebang-tests - (lambda _ - (with-directory-excursion "src/test/ui/parser/shebang" - (delete-file "shebang-doc-comment.rs") - (delete-file "sneaky-attrib.rs") - #t))) - ;; This test case synchronizes itself by starting a localhost TCP - ;; server. This doesn't work as networking is not available. - (add-after 'patch-tests 'skip-networking-test - (lambda _ - (substitute* "src/tools/cargo/tests/testsuite/freshness.rs" - (("fn linking_interrupted" all) - (string-append "#[ignore] " all))) - #t))))))))) + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'set-linker-locale-to-utf8 + (lambda _ + (substitute* (find-files "." "^linker.rs$") + (("linker.env\\(\"LC_ALL\", \"C\"\\);") + "linker.env(\"LC_ALL\", \"en_US.UTF-8\");"))))))))))) (define-public rust-1.46 - (let ((base-rust - (rust-bootstrapped-package rust-1.45 "1.46.0" - "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"))) + (let ((base-rust (rust-bootstrapped-package + rust-1.45 "1.46.0" + "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"))) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust))) @@ -1333,128 +681,161 @@ move around." ((#:phases phases) `(modify-phases ,phases (replace 'build - (lambda* _ - (invoke "./x.py" "build") - (invoke "./x.py" "build" "src/tools/cargo") - (invoke "./x.py" "build" "src/tools/rustfmt"))) + ;; Phase overridden to also build rustfmt. + (lambda* (#:key parallel-build? #:allow-other-keys) + (let ((job-spec (string-append + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (invoke "./x.py" job-spec "build") + (invoke "./x.py" job-spec "build" "src/tools/cargo") + (invoke "./x.py" job-spec "build" "src/tools/rustfmt")))) (replace 'check - (lambda* _ - ;; Test rustfmt. - (let ((parallel-job-spec - (string-append "-j" (number->string - (min 4 - (parallel-job-count)))))) - (invoke "./x.py" parallel-job-spec "test" "-vv") - (invoke "./x.py" parallel-job-spec "test" - "src/tools/cargo") - (invoke "./x.py" parallel-job-spec "test" - "src/tools/rustfmt")))) + ;; Phase overridden to also test rustfmt. + (lambda* (#:key tests? parallel-build? #:allow-other-keys) + (when tests? + (let ((job-spec (string-append + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (invoke "./x.py" job-spec "test" "-vv") + (invoke "./x.py" job-spec "test" "src/tools/cargo") + (invoke "./x.py" job-spec "test" "src/tools/rustfmt"))))) (replace 'install + ;; Phase overridden to also install rustfmt. (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") (substitute* "config.toml" - ;; replace prefix to specific output + ;; Adjust the prefix to the 'cargo' output. (("prefix = \"[^\"]*\"") - (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) + (format #f "prefix = ~s" (assoc-ref outputs "cargo")))) (invoke "./x.py" "install" "cargo") (substitute* "config.toml" - ;; replace prefix to specific output + ;; Adjust the prefix to the 'rustfmt' output. (("prefix = \"[^\"]*\"") - (string-append "prefix = \"" (assoc-ref outputs "rustfmt") "\""))) - (invoke "./x.py" "install" "rustfmt"))) - (replace 'delete-install-logs - (lambda* (#:key outputs #:allow-other-keys) - (define (delete-manifest-file out-path file) - (delete-file (string-append out-path "/lib/rustlib/" file))) - - (let ((out (assoc-ref outputs "out")) - (cargo-out (assoc-ref outputs "cargo")) - (rustfmt-out (assoc-ref outputs "rustfmt"))) - (for-each - (lambda (file) (delete-manifest-file out file)) - '("install.log" - "manifest-rust-docs" - ,(string-append "manifest-rust-std-" - (nix-system->gnu-triplet-for-rust)) - "manifest-rustc")) - (for-each - (lambda (file) (delete-manifest-file cargo-out file)) - '("install.log" - "manifest-cargo")) - (for-each - (lambda (file) (delete-manifest-file rustfmt-out file)) - '("install.log" - "manifest-rustfmt-preview")) - #t)))))))))) + (format #f "prefix = ~s" (assoc-ref outputs "rustfmt")))) + (invoke "./x.py" "install" "rustfmt")))))))))) (define-public rust-1.47 - (let ((base-rust - (rust-bootstrapped-package rust-1.46 "1.47.0" - "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i"))) - (package - (inherit base-rust) - (inputs - (alist-replace "llvm" (list llvm-11) - (package-inputs base-rust))) - (arguments - (substitute-keyword-arguments (package-arguments base-rust) - ((#:phases phases) - `(modify-phases ,phases - ;; The source code got rearranged: libstd is now in the newly created library folder. - (replace 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "library/std/src/process.rs" - (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html> - (substitute* "library/std/src/sys/unix/process/process_common.rs" - (("fn test_process_mask") "#[allow(unused_attributes)] - #[ignore] - fn test_process_mask")) - #t))) - (delete 'patch-cargo-checksums) - (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums - ;; Generate checksums after patching generated files (in - ;; particular, vendor/jemalloc/rep/Makefile). - (lambda* _ - (use-modules (guix build cargo-utils)) - (substitute* "Cargo.lock" - (("(checksum = )\".*\"" all name) - (string-append name "\"" ,%cargo-reference-hash "\""))) - (generate-all-checksums "vendor") - #t))))))))) + (rust-bootstrapped-package + rust-1.46 "1.47.0" "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")) (define-public rust-1.48 - (let ((base-rust - (rust-bootstrapped-package rust-1.47 "1.48.0" - "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf"))) + (rust-bootstrapped-package + rust-1.47 "1.48.0" "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")) + +(define-public rust-1.49 + (let ((base-rust (rust-bootstrapped-package + rust-1.48 "1.49.0" + "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))) (package (inherit base-rust) - (source - (origin - (inherit (package-source base-rust)) - ;; New patch required due to the second part of the source code rearrangement: - ;; the relevant source code is now in the compiler directory. - (patches (search-patches "rust-1.48-linker-locale.patch")))) + (outputs (cons "doc" (package-outputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) + ((#:tests? _ #f) + #t) ((#:phases phases) `(modify-phases ,phases - ;; Some tests got split out into separate files. - (replace 'patch-tests + (add-after 'unpack 'relax-gdb-auto-load-safe-path + ;; Allow GDB to load binaries from any location, otherwise the + ;; gdbinfo tests fail. This is only useful when testing with a + ;; GDB version newer than 8.2. + (lambda _ + (setenv "HOME" (getcwd)) + (with-output-to-file (string-append (getenv "HOME") "/.gdbinit") + (lambda _ + (format #t "set auto-load safe-path /~%"))) + ;; Do not launch gdb with '-nx' which causes it to not execute + ;; any init file. + (substitute* "src/tools/compiletest/src/runtest.rs" + (("\"-nx\".as_ref\\(\\), ") + "")))) + (add-after 'unpack 'patch-cargo-env-shebang + (lambda _ + (substitute* '("src/tools/cargo/tests/testsuite/build.rs" + "src/tools/cargo/tests/testsuite/fix.rs") + ;; The cargo *_wrapper tests set RUSTC.*WRAPPER environment + ;; variable which points to /usr/bin/env. Since it's not a + ;; shebang, it needs to be manually patched. + (("/usr/bin/env") + (which "env"))))) + (add-after 'unpack 'disable-tests-requiring-git + (lambda _ + (substitute* "src/tools/cargo/tests/testsuite/new.rs" + (("fn author_prefers_cargo") + "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") + "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") + "#[ignore]\nfn finds_local_author_git")))) + (add-after 'unpack 'patch-command-exec-tests + ;; This test suite includes some tests that the stdlib's + ;; `Command` execution properly handles in situations where + ;; the environment or PATH variable are empty, but this fails + ;; since we don't have `echo` available at its usual FHS + ;; location. + (lambda _ + (substitute* (match (find-files "." "^command-exec.rs$") + ((file) file)) + (("Command::new\\(\"echo\"\\)") + (format #f "Command::new(~s)" (which "echo")))))) + (add-after 'unpack 'patch-command-uid-gid-test + (lambda _ + (substitute* (match (find-files "." "^command-uid-gid.rs$") + ((file) file)) + (("/bin/sh") + (which "sh"))))) + (add-after 'unpack 'skip-shebang-tests + ;; This test make sure that the parser behaves properly when a + ;; source file starts with a shebang. Unfortunately, the + ;; patch-shebangs phase changes the meaning of these edge-cases. + ;; We skip the test since it's drastically unlikely Guix's + ;; packaging will introduce a bug here. + (lambda _ + (delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs"))) + (add-after 'unpack 'patch-process-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) (substitute* "library/std/src/process/tests.rs" - (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\""))) (substitute* "library/std/src/sys/unix/process/process_common/tests.rs" - (("fn test_process_mask") "#[allow(unused_attributes)] + (("fn test_process_mask") + "#[allow(unused_attributes)] #[ignore] - fn test_process_mask")) - #t)))))))))) - -(define-public rust-1.49 - (rust-bootstrapped-package rust-1.48 "1.49.0" - "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm")) + fn test_process_mask"))))) + (add-after 'unpack 'disable-interrupt-tests + (lambda _ + ;; This test hangs in the build container; disable it. + (substitute* (match (find-files "." "^freshness.rs$") + ((file) file)) + (("fn linking_interrupted") + "#[ignore]\nfn linking_interrupted")) + ;; Likewise for the ctrl_c_kills_everyone test. + (substitute* (match (find-files "." "^death.rs$") + ((file) file)) + (("fn ctrl_c_kills_everyone") + "#[ignore]\nfn ctrl_c_kills_everyone")))) + (add-after 'configure 'enable-docs + (lambda _ + (substitute* "config.toml" + (("docs = false") + "docs = true")))) + (add-after 'configure 'add-gdb-to-config + (lambda* (#:key inputs #:allow-other-keys) + (let ((gdb (assoc-ref inputs "gdb"))) + (substitute* "config.toml" + (("^python =.*" all) + (string-append all + "gdb = \"" gdb "/bin/gdb\"\n")))))))))) + ;; Add test inputs. + (native-inputs (cons* + ;; The tests fail when using GDB 10 (see: + ;; https://github.com/rust-lang/rust/issues/79009). + `("gdb" ,gdb-9.2) + `("procps" ,procps) + (package-native-inputs base-rust)))))) (define-public rust-1.50 (rust-bootstrapped-package rust-1.49 "1.50.0" @@ -1474,5 +855,8 @@ move around." (alist-replace "llvm" (list llvm-12) (package-inputs base-rust)))))) -;; TODO(staging): Bump this variable to the latest packaged rust. -(define-public rust rust-1.45) +;;; Note: Only the latest versions of Rust are supported and tested. The +;;; intermediate rusts are built for bootstrapping purposes and should not +;;; be relied upon. This is to ease maintenance and reduce the time +;;; required to build the full Rust bootstrap chain. +(define-public rust rust-1.49) |