From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiC6-0000jp-5F for guix-patches@gnu.org; Tue, 24 Mar 2020 07:58:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiC2-00077F-93 for guix-patches@gnu.org; Tue, 24 Mar 2020 07:58:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGiC2-000776-0r for guix-patches@gnu.org; Tue, 24 Mar 2020 07:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGiC1-0001AM-UH for guix-patches@gnu.org; Tue, 24 Mar 2020 07:58:01 -0400 Subject: [bug#38110] [PATCH core-updates v3] gnu: rust: Bootstrap rust@1.29.0 by mrustc@0.9. Resent-Message-ID: Date: Tue, 24 Mar 2020 12:57:16 +0100 From: Danny Milosavljevic Message-ID: <20200324125716.756eb1f2@scratchpost.org> In-Reply-To: <87o8sm3efs.fsf@devup.no> References: <20191107222756.20064-1-dannym@scratchpost.org> <20200315192311.6505-1-dannym@scratchpost.org> <877dzf9fas.fsf@devup.no> <20200323222403.36a6ce1f@scratchpost.org> <87o8sm3efs.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/CAxEekpmg6e.y5Kv57vK3B8"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 38110@debbugs.gnu.org --Sig_/CAxEekpmg6e.y5Kv57vK3B8 Content-Type: multipart/mixed; boundary="MP_/sUAqtJYFMMgXGphhsF/Opme" --MP_/sUAqtJYFMMgXGphhsF/Opme Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi Marius, On Mon, 23 Mar 2020 23:16:07 +0100 Marius Bakke wrote: > > Building rust, I get a texinfo build failure: > How are you building Rust? I've only used the Guix package definition > and did not get as far as actually running the test suite. Do you have > an updated build script? It's failing in texinfo, not in rust. Also, on my laptop, it's not failing in texinfo. So I guess it has something to do with bayfront or the machines it offloads to. Attached gnu/packages/rust.scm , but it's the same we already have. What I mean is that I cannot see any way for me to test it myself right now. What error message do you get when trying to use the rust compiler? --MP_/sUAqtJYFMMgXGphhsF/Opme Content-Type: text/x-scheme Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=rust.scm ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016 David Craven ;;; Copyright =C2=A9 2016 Eric Le Bihan ;;; Copyright =C2=A9 2016 ng0 ;;; Copyright =C2=A9 2017 Ben Woodcroft ;;; Copyright =C2=A9 2017, 2018 Nikolai Merinov ;;; Copyright =C2=A9 2017, 2019 Efraim Flashner ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2019 Ivan Petkov ;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; ;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . (define-module (gnu packages rust) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix utils) #:use-module (ice-9 match) #:use-module (srfi srfi-26)) (define %cargo-reference-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") (define* (nix-system->gnu-triplet-for-rust #:optional (system (%current-system))) (match system ("x86_64-linux" "x86_64-unknown-linux-gnu") ("i686-linux" "i686-unknown-linux-gnu") ("armhf-linux" "armv7-unknown-linux-gnueabihf") ("aarch64-linux" "aarch64-unknown-linux-gnu") ("mips64el-linux" "mips64el-unknown-linux-gnuabi64") (_ (nix-system->gnu-triplet system)))) (define* (rust-uri version #:key (dist "static")) (string-append "https://" dist ".rust-lang.org/dist/" "rustc-" version "-src.tar.gz")) (define* (rust-bootstrapped-package base-rust version checksum) "Bootstrap rust VERSION with source checksum CHECKSUM using BASE-RUST." (package (inherit base-rust) (version version) (source (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.29.0")) (package (name "mrustc") (version "0.9") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/thepowersgang/mrustc.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (patches (search-patches "mrustc-group-link.patch")) (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.29)))) (arguments `(#:test-target "test" #:make-flags (list ,(string-append "RUSTC_TARGET=3D" (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")) (invoke "patch" "-p1" ,(string-append "rustc-" rustc-version "-src.patch")) (setenv "RUSTC_VERSION" ,rustc-version) (setenv "MRUSTC_TARGET_VER" ,(version-major+minor rustc-version)) (setenv "OUTDIR_SUF" "") #t)) (replace 'configure (lambda _ (setenv "CC" "gcc") (setenv "CXX" "g++") #t)) (add-after 'build 'build-minicargo (lambda* (#:key make-flags #:allow-other-keys) ;; TODO: minicargo.mk: RUSTC_VERSION=3D$(RUSTC_VERSION) RUST= C_CHANNEL=3D$(RUSTC_SRC_TY) OUTDIR_SUF=3D$(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 . ; (setenv "MRUSTC_TARGET_VER" ,(version-major+minor rustc-ver= sion)) ; (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 me= mory safety and thread safety guarantees.") (home-page "https://github.com/thepowersgang/mrustc") ;; Dual licensed. (license (list license:asl2.0 license:expat))))) ;; TODO: Delete src/llvm-emscripten (define rust-1.29 (package (name "rust") (version "1.29.0") (source (origin (method url-fetch) (uri (rust-uri "1.29.0")) (sha256 (base32 "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9s= x4")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/llvm") #t)) (patches (map search-patch '("rust-1.25-accept-more-detailed-gdb-li= nes.patch" "rust-reproducible-builds.patch" "rustc-1.29.0-src.patch"))))) (outputs '("out" "cargo" "doc")) (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) (arguments `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksum= s' #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-sy= stem)) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) ;; Disable test for cross compilation support. (write "X") (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-tests (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")) ;; (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-cargo-index-update (lambda* _ (substitute* "src/tools/cargo/tests/testsuite/generate_lockfil= e.rs" ;; This test wants to update the crate index. (("fn no_index_update") "#[ignore]\nfn no_index_update")) #t)) (add-after 'patch-tests '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_cosi= ne")) ;; 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-tra= it-impl.rs") #t)) (add-after 'patch-tests 'remove-unsupported-tests (lambda* _ ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PAT= H. ;; (delete-file-recursively "src/test/run-make-fulldeps/linker-ou= tput-non-utf8") #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda* _ (use-modules (guix build cargo-utils)) (substitute* "src/Cargo.lock" (("(\"checksum .* =3D )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) (generate-all-checksums "src/vendor") #t)) ;; This phase is overridden by newer versions. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (setenv "CXX" "g++") (setenv "HOST_CXX" "g++") #t)) ;; This phase is overridden by newer versions. (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.29.0-stable-mrustc") (setenv "MRUSTC_TARGET_VER" ,(version-major+minor version)) ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. ;; Crate::load_extern_crate ignores the search path, so make ;; the situation easier for it. ;; Also, 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=3D" (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. (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 ("gdb" ,gdb) ; 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-6) ("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 am= ong ;; modules (see ). (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"))))) (synopsis "Compiler for the Rust progamming language") (description "Rust is a systems programming language that provides memo= ry 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.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)) (patches '()))) (outputs '("out" "doc" "cargo")) ;; Since rust-1.29 is local, it's quite probable that Hydra ;; will build rust-1.29 only as a dependency of rust-1.30. ;; But then Hydra will use the wrong properties, the ones here, ;; for rust-1.29. Therefore, we copied the properties of ;; rust-1.29 here. (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) (inputs ;; Use LLVM 6.0 (alist-replace "llvm" (list llvm-6) (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments rust-1.29) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'remove-flaky-test (lambda _ ;; See . (when (file-exists? "src/test/run-make/issue-26092") (delete-file-recursively "src/test/run-make/issue-26092"= )) #t)) (add-after 'configure 'enable-codegen-tests ;; Codegen tests should pass with llvm 6, so enable them. (lambda* _ (substitute* "config.toml" (("codegen-tests =3D false") "")) #t)) ;; The test has been moved elsewhere. (add-after 'patch-tests 'disable-amd64-avx-test (lambda _ (substitute* "src/test/ui/issues/issue-44056.rs" (("only-x86_64") "ignore-test")) #t)) (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_prefe= rs_cargo") (("fn finds_author_git") "#[ignore]\nfn finds_author_git= ") (("fn finds_local_author_git") "#[ignore]\nfn finds_loca= l_author_git")) #t)) (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)) (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 " [llvm] [build] cargo =3D \"" cargo "/bin/cargo" "\" rustc =3D \"" rustc "/bin/rustc" "\" docs =3D true python =3D \"" python "/bin/python2" "\" gdb =3D \"" gdb "/bin/gdb" "\" vendor =3D true submodules =3D false [install] prefix =3D \"" out "\" docdir =3D \"" doc "/share/doc/rust" "\" sysconfdir =3D \"etc\" [rust] default-linker =3D \"" gcc "/bin/gcc" "\" channel =3D \"stable\" rpath =3D true " ;; There are 2 failed codegen tests: ;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs ;; These tests require a patched LLVM "codegen-tests =3D false [target." ,(nix-system->gnu-triplet-for-rust) "] llvm-config =3D \"" llvm "/bin/llvm-config" "\" cc =3D \"" gcc "/bin/gcc" "\" cxx =3D \"" gcc "/bin/g++" "\" ar =3D \"" binutils "/bin/ar" "\" jemalloc =3D \"" 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)) (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 exis= t". ;; 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* _ ;; 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 'install (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") (substitute* "config.toml" ;; replace prefix to specific output (("prefix =3D \"[^\"]*\"") (string-append "prefix =3D \"" (assoc-ref outputs "carg= o") "\""))) (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/" fil= e))) (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" "manifest-rust-std-x86_64-unknown-linux-gnu" "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 "/li= b")))) #t)))))))))) (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 (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) (substitute* "src/test/run-pass/command-exec.rs" ;; This test suite includes some tests that the stdlib= 's ;; `Command` execution properly handles situations whe= re ;; the environment or PATH variable are empty, but this ;; fails since we don't have `echo` available in the u= sual ;; Linux directories. ;; NB: the leading space is so we don't fail a tidy ch= eck ;; for trailing whitespace, and the newlines are to en= sure ;; we don't exceed the 100 chars tidy check as well ((" Command::new\\(\"echo\"\\)") (string-append "\nCommand::new(\"" coreutils "/bin/ec= ho\")\n"))) #t))) ;; 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))))))))) (define-public rust-1.32 (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/je= malloc") #t)) (patches (map search-patch '("rust-reproducible-builds.patch"))) ;; 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))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases ;; Cargo.lock and the vendor/ directory have been moved to the ;; root of the rust tarball (replace 'patch-cargo-checksums (lambda* _ (use-modules (guix build cargo-utils)) (substitute* "Cargo.lock" (("(\"checksum .* =3D )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) (generate-all-checksums "vendor") #t)) (add-after 'enable-codegen-tests 'override-jemalloc (lambda* (#:key inputs #:allow-other-keys) ;; The compiler is no longer directly built against jemall= oc, ;; but rather via the jemalloc-sys crate (which vendors the ;; jemalloc source). To use jemalloc we must enable linkin= g to ;; it (otherwise it would use the system allocator), and s= et ;; an environment variable pointing to the compiled jemall= oc. (substitute* "config.toml" (("^jemalloc =3D.*$") "") (("[[]rust[]]") "\n[rust]\njemalloc=3Dtrue\n")) (setenv "JEMALLOC_OVERRIDE" (string-append (assoc-ref inpu= ts "jemalloc") "/lib/libjemall= oc_pic.a")) #t)) ;; Remove no longer relevant steps (delete 'remove-flaky-test) (delete 'patch-aarch64-test)))))))) (define-public rust-1.33 (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")))) (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))))))))) (define-public rust-1.34 (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/jemallo= c") #t))))))) (define-public rust-1.35 (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))))))))) (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)))))))) (define-public rust (let ((base-rust (rust-bootstrapped-package rust-1.36 "1.37.0" "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) (package (inherit base-rust) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'configure-cargo-home (lambda _ (let ((cargo-home (string-append (getcwd) "/.cargo"))) (mkdir-p cargo-home) (setenv "CARGO_HOME" cargo-home) #t)))))))))) --MP_/sUAqtJYFMMgXGphhsF/Opme-- --Sig_/CAxEekpmg6e.y5Kv57vK3B8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl559ZwACgkQ5xo1VCww uqVlEgf/VRRzFVB4oOLE9uTGzGXA2oDvJQ9DqTLuAdGL1U6tz6FLPHJ/vWAdQJFz mcplecOE+b64oMkW0TPi9bFJChR6V37eQhC7HTTNBI7ka2U+JoR5iDxpuqUf6o/u ZLWXsEouDwDEjiwwH46YACh6VskBL2vfAuu/1y4nVVT5N6NxeyqnBkv6Ir2usHlJ MwS0l0YzsNSF6Kb1riAnvuk/QKiZjJqvBP2uEhP+8B6YYrqFBtmJH8RA2anvXq1T QWpHKtH0VwGNjCRguu91EBGFgi2g3HRpdCgYGXjmKmwTEn3A6G0V+CaMHsmnpD4h /PBAj28L18RBw3SKVBBwr3/prbCyxg== =mquH -----END PGP SIGNATURE----- --Sig_/CAxEekpmg6e.y5Kv57vK3B8--