2016-09-22 13:04:14 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
;;; Copyright © 2016 David Craven <david@craven.ch>
|
2016-09-28 14:24:20 +00:00
|
|
|
;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
mailmap: Update entries for Nikita.
* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-05-11 11:05:45 +00:00
|
|
|
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
2017-01-31 11:01:59 +00:00
|
|
|
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
2018-03-13 19:06:53 +00:00
|
|
|
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
|
2020-07-27 07:06:03 +00:00
|
|
|
;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
2020-07-15 21:19:57 +00:00
|
|
|
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
2018-04-15 08:13:39 +00:00
|
|
|
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
|
2019-02-15 07:04:28 +00:00
|
|
|
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
2021-01-02 18:11:27 +00:00
|
|
|
;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net>
|
2020-09-25 19:24:46 +00:00
|
|
|
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
|
2020-12-02 13:18:35 +00:00
|
|
|
;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org>
|
2016-09-22 13:04:14 +00:00
|
|
|
;;;
|
|
|
|
;;; 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 <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (gnu packages rust)
|
|
|
|
#:use-module (gnu packages base)
|
2017-06-17 18:37:01 +00:00
|
|
|
#:use-module (gnu packages bison)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (gnu packages bootstrap)
|
2016-09-28 14:24:20 +00:00
|
|
|
#:use-module (gnu packages cmake)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (gnu packages compression)
|
2016-12-10 13:04:12 +00:00
|
|
|
#:use-module (gnu packages curl)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (gnu packages elf)
|
2017-06-17 18:37:01 +00:00
|
|
|
#:use-module (gnu packages flex)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (gnu packages gcc)
|
2017-12-10 21:14:01 +00:00
|
|
|
#:use-module (gnu packages gdb)
|
2016-09-28 14:24:20 +00:00
|
|
|
#:use-module (gnu packages jemalloc)
|
2017-06-17 18:37:01 +00:00
|
|
|
#:use-module (gnu packages linux)
|
2016-09-28 14:24:20 +00:00
|
|
|
#:use-module (gnu packages llvm)
|
2016-12-10 13:04:12 +00:00
|
|
|
#:use-module (gnu packages pkg-config)
|
2016-09-28 14:24:20 +00:00
|
|
|
#:use-module (gnu packages python)
|
2016-12-10 13:04:12 +00:00
|
|
|
#:use-module (gnu packages ssh)
|
|
|
|
#:use-module (gnu packages tls)
|
2017-12-10 21:14:01 +00:00
|
|
|
#:use-module (gnu packages)
|
2016-12-10 13:04:12 +00:00
|
|
|
#:use-module (guix build-system cargo)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
#:use-module (guix build-system trivial)
|
|
|
|
#:use-module (guix download)
|
2018-04-15 08:13:39 +00:00
|
|
|
#:use-module (guix git-download)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
|
|
#:use-module (guix packages)
|
2018-03-13 19:06:53 +00:00
|
|
|
#:use-module ((guix build utils) #:select (alist-replace))
|
|
|
|
#:use-module (guix utils)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (ice-9 match)
|
|
|
|
#:use-module (srfi srfi-26))
|
|
|
|
|
2020-03-08 22:32:35 +00:00
|
|
|
;; This is the hash for the empty file, and the reason it's relevant is not
|
|
|
|
;; the most obvious.
|
|
|
|
;;
|
|
|
|
;; The root of the problem is that Cargo keeps track of a file called
|
|
|
|
;; Cargo.lock, that contains the hash of the tarball source of each dependency.
|
|
|
|
;;
|
|
|
|
;; However, tarball sources aren't handled well by Guix because of the need to
|
|
|
|
;; patch shebangs in any helper scripts. This is why we use Cargo's vendoring
|
|
|
|
;; capabilities, where instead of the tarball, a directory is provided in its
|
|
|
|
;; place. (In the case of rustc, the source code already ships with vendored
|
|
|
|
;; dependencies, but crates built with cargo-build-system undergo vendoring
|
|
|
|
;; during the build.)
|
|
|
|
;;
|
|
|
|
;; To preserve the advantages of checksumming, vendored dependencies contain
|
|
|
|
;; a file called .cargo-checksum.json, which contains the hash of the tarball,
|
|
|
|
;; as well as the list of files in it, with the hash of each file.
|
|
|
|
;;
|
|
|
|
;; The patch-cargo-checksums phase of cargo-build-system runs after
|
|
|
|
;; any Guix-specific patches to the vendored dependencies and regenerates the
|
|
|
|
;; .cargo-checksum.json files, but it's hard to know the tarball checksum that
|
|
|
|
;; should be written to the file - and taking care of any unhandled edge case
|
|
|
|
;; would require rebuilding everything that depends on rust. This is why we lie,
|
|
|
|
;; and say that the tarball has the hash of an empty file. It's not a problem
|
|
|
|
;; because cargo-build-system removes the Cargo.lock file. We can't do that
|
|
|
|
;; for rustc because of a quirk of its build system, so we modify the lock file
|
|
|
|
;; to substitute the hash.
|
2017-12-10 21:14:01 +00:00
|
|
|
(define %cargo-reference-hash
|
|
|
|
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
|
2016-09-22 13:04:14 +00:00
|
|
|
|
2018-06-03 07:21:13 +00:00
|
|
|
(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))))
|
|
|
|
|
2019-05-02 11:11:06 +00:00
|
|
|
(define* (rust-uri version #:key (dist "static"))
|
|
|
|
(string-append "https://" dist ".rust-lang.org/dist/"
|
|
|
|
"rustc-" version "-src.tar.gz"))
|
2019-03-28 23:38:02 +00:00
|
|
|
|
2019-05-02 11:11:06 +00:00
|
|
|
(define* (rust-bootstrapped-package base-rust version checksum)
|
|
|
|
"Bootstrap rust VERSION with source checksum CHECKSUM using BASE-RUST."
|
2019-03-28 23:38:02 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(version version)
|
|
|
|
(source
|
2019-05-02 11:11:06 +00:00
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(uri (rust-uri version))
|
|
|
|
(sha256 (base32 checksum))))
|
2018-09-01 22:22:53 +00:00
|
|
|
(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")
|
2020-01-21 19:30:06 +00:00
|
|
|
(version "0.9")
|
2018-09-01 22:22:53 +00:00
|
|
|
(source (origin
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
gnu: Remove ".git" from "https://github/…/….git".
Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix
swh) would sometimes return #f for these because the ".git" URLs are
redirects to the non-".git" URLs. Consequently, 'guix lint -c archival'
would keep saying "scheduled Software Heritage archival"; likewise, the
fallback download code would fail.
* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/aidc.scm,
gnu/packages/algebra.scm,
gnu/packages/android.scm,
gnu/packages/animation.scm,
gnu/packages/arcan.scm,
gnu/packages/assembly.scm,
gnu/packages/audio.scm,
gnu/packages/authentication.scm,
gnu/packages/avr.scm,
gnu/packages/axoloti.scm,
gnu/packages/backup.scm,
gnu/packages/bash.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioconductor.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/boost.scm,
gnu/packages/build-tools.scm,
gnu/packages/c.scm,
gnu/packages/calendar.scm,
gnu/packages/cdrom.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/chez.scm,
gnu/packages/clojure.scm,
gnu/packages/code.scm,
gnu/packages/compression.scm,
gnu/packages/compton.scm,
gnu/packages/coq.scm,
gnu/packages/cpp.scm,
gnu/packages/cran.scm,
gnu/packages/crypto.scm,
gnu/packages/curl.scm,
gnu/packages/databases.scm,
gnu/packages/datastructures.scm,
gnu/packages/debug.scm,
gnu/packages/disk.scm,
gnu/packages/distributed.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/dns.scm,
gnu/packages/docker.scm,
gnu/packages/education.scm,
gnu/packages/efi.scm,
gnu/packages/elixir.scm,
gnu/packages/emacs-xyz.scm,
gnu/packages/embedded.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/erlang.scm,
gnu/packages/fabric-management.scm,
gnu/packages/file-systems.scm,
gnu/packages/finance.scm,
gnu/packages/firmware.scm,
gnu/packages/flashing-tools.scm,
gnu/packages/fonts.scm,
gnu/packages/fontutils.scm,
gnu/packages/fpga.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/genealogy.scm,
gnu/packages/genimage.scm,
gnu/packages/geo.scm,
gnu/packages/gimp.scm,
gnu/packages/gl.scm,
gnu/packages/gnome-xyz.scm,
gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/golang.scm,
gnu/packages/gpodder.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/groff.scm,
gnu/packages/groovy.scm,
gnu/packages/gtk.scm,
gnu/packages/guile-xyz.scm,
gnu/packages/guile.scm,
gnu/packages/hardware.scm,
gnu/packages/haskell-apps.scm,
gnu/packages/haskell-xyz.scm,
gnu/packages/hexedit.scm,
gnu/packages/i2p.scm,
gnu/packages/ibus.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/ipfs.scm,
gnu/packages/java-graphics.scm,
gnu/packages/java-maths.scm,
gnu/packages/java.scm,
gnu/packages/javascript.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/jupyter.scm,
gnu/packages/kodi.scm,
gnu/packages/language.scm,
gnu/packages/lego.scm,
gnu/packages/less.scm,
gnu/packages/libusb.scm,
gnu/packages/linux.scm,
gnu/packages/lirc.scm,
gnu/packages/lisp-xyz.scm,
gnu/packages/llvm.scm,
gnu/packages/logging.scm,
gnu/packages/lolcode.scm,
gnu/packages/lua.scm,
gnu/packages/lxde.scm,
gnu/packages/lxqt.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/markup.scm,
gnu/packages/maths.scm,
gnu/packages/maven.scm,
gnu/packages/mes.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/node-xyz.scm,
gnu/packages/ocaml.scm,
gnu/packages/ocr.scm,
gnu/packages/onc-rpc.scm,
gnu/packages/opencl.scm,
gnu/packages/opencog.scm,
gnu/packages/pantheon.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/perl6.scm,
gnu/packages/phabricator.scm,
gnu/packages/popt.scm,
gnu/packages/printers.scm,
gnu/packages/prolog.scm,
gnu/packages/protobuf.scm,
gnu/packages/pulseaudio.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/python-xyz.scm,
gnu/packages/qt.scm,
gnu/packages/radio.scm,
gnu/packages/rails.scm,
gnu/packages/rdf.scm,
gnu/packages/rednotebook.scm,
gnu/packages/rpc.scm,
gnu/packages/rsync.scm,
gnu/packages/ruby.scm,
gnu/packages/rust.scm,
gnu/packages/scheme.scm,
gnu/packages/screen.scm,
gnu/packages/security-token.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/shellutils.scm,
gnu/packages/simh.scm,
gnu/packages/sml.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/stenography.scm,
gnu/packages/sync.scm,
gnu/packages/syncthing.scm,
gnu/packages/synergy.scm,
gnu/packages/telephony.scm,
gnu/packages/terminals.scm,
gnu/packages/tex.scm,
gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tmux.scm,
gnu/packages/tor.scm,
gnu/packages/toys.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/vim.scm,
gnu/packages/virtualization.scm,
gnu/packages/vlang.scm,
gnu/packages/vnc.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wireservice.scm,
gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xml.scm,
gnu/packages/xorg.scm,
tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
2020-07-12 20:53:28 +00:00
|
|
|
(url "https://github.com/thepowersgang/mrustc")
|
2018-09-01 22:22:53 +00:00
|
|
|
(commit (string-append "v" version))))
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2020-01-21 19:30:06 +00:00
|
|
|
"194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2"))))
|
2018-09-01 22:22:53 +00:00
|
|
|
(outputs '("out" "cargo"))
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(inputs
|
2020-01-21 15:47:10 +00:00
|
|
|
`(("zlib" ,zlib)))
|
2018-09-01 22:22:53 +00:00
|
|
|
(native-inputs
|
|
|
|
`(("bison" ,bison)
|
|
|
|
("flex" ,flex)
|
|
|
|
;; Required for the libstd sources.
|
2020-01-21 15:47:10 +00:00
|
|
|
("rustc" ,(package-source rust-1.19))))
|
2018-09-01 22:22:53 +00:00
|
|
|
(arguments
|
2020-01-21 19:30:06 +00:00
|
|
|
`(#:test-target "test"
|
2020-01-21 15:47:10 +00:00
|
|
|
#:make-flags
|
|
|
|
(list ,(string-append "RUSTC_TARGET="
|
|
|
|
(or (%current-target-system)
|
|
|
|
(nix-system->gnu-triplet-for-rust))))
|
2018-09-01 22:22:53 +00:00
|
|
|
#:phases
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
(add-after 'unpack 'patch-date
|
|
|
|
(lambda _
|
|
|
|
(substitute* "Makefile"
|
|
|
|
(("shell date") "shell date -d @1"))
|
2020-01-21 15:47:10 +00:00
|
|
|
(substitute* "run_rustc/Makefile"
|
|
|
|
(("[$]Vtime ") "$V "))
|
2018-09-01 22:22:53 +00:00
|
|
|
#t))
|
|
|
|
(add-after 'patch-date 'unpack-target-compiler
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(invoke "tar" "xf" (assoc-ref inputs "rustc"))
|
2020-01-21 15:47:10 +00:00
|
|
|
(chdir ,(string-append "rustc-" rustc-version "-src"))
|
2020-01-21 19:30:06 +00:00
|
|
|
(invoke "patch" "-p0" ,(string-append "../rustc-" rustc-version
|
|
|
|
"-src.patch"))
|
2018-09-01 22:22:53 +00:00
|
|
|
(chdir "..")
|
2020-01-21 19:30:06 +00:00
|
|
|
(setenv "RUSTC_VERSION" ,rustc-version)
|
|
|
|
(setenv "MRUSTC_TARGET_VER"
|
|
|
|
,(version-major+minor rustc-version))
|
|
|
|
(setenv "OUTDIR_SUF" "")
|
2018-09-01 22:22:53 +00:00
|
|
|
#t))
|
|
|
|
(replace 'configure
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
2020-01-21 15:47:10 +00:00
|
|
|
(setenv "CC" (string-append (assoc-ref inputs "gcc")
|
|
|
|
"/bin/gcc"))
|
|
|
|
(setenv "CXX" (string-append (assoc-ref inputs "gcc")
|
|
|
|
"/bin/g++"))
|
2018-09-01 22:22:53 +00:00
|
|
|
#t))
|
|
|
|
(add-after 'build 'build-minicargo
|
2020-01-21 15:47:10 +00:00
|
|
|
(lambda* (#:key make-flags #:allow-other-keys)
|
2020-01-21 19:30:06 +00:00
|
|
|
;; TODO: minicargo.mk: RUSTC_VERSION=$(RUSTC_VERSION) RUSTC_CHANNEL=$(RUSTC_SRC_TY) OUTDIR_SUF=$(OUTDIR_SUF)
|
2020-01-21 15:47:10 +00:00
|
|
|
(apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags)
|
|
|
|
(apply invoke "make" "-C" "tools/minicargo" make-flags)))
|
2020-01-21 19:30:06 +00:00
|
|
|
;(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)))
|
2018-09-01 22:22:53 +00:00
|
|
|
(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"))
|
2020-01-21 15:47:10 +00:00
|
|
|
(gcc (assoc-ref inputs "gcc"))
|
2020-01-21 19:30:06 +00:00
|
|
|
(run_rustc (string-append out
|
|
|
|
"/share/mrustc/run_rustc")))
|
2018-09-01 22:22:53 +00:00
|
|
|
;; These files are not reproducible.
|
|
|
|
(for-each delete-file (find-files "output" "\\.txt$"))
|
2020-01-21 19:30:06 +00:00
|
|
|
;(delete-file-recursively "output/local_tests")
|
|
|
|
(mkdir-p (dirname lib/rust))
|
2018-09-01 22:22:53 +00:00
|
|
|
(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)
|
2020-01-21 15:47:10 +00:00
|
|
|
(mkdir-p run_rustc)
|
|
|
|
(copy-file "run_rustc/Makefile"
|
|
|
|
(string-append run_rustc "/Makefile"))
|
2018-09-01 22:22:53 +00:00
|
|
|
#t))))))
|
2020-02-14 00:53:45 +00:00
|
|
|
(synopsis "Compiler for the Rust programming language")
|
2018-09-01 22:22:53 +00:00
|
|
|
(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)))))
|
|
|
|
|
2018-07-15 18:47:30 +00:00
|
|
|
(define rust-1.19
|
2016-09-28 14:24:20 +00:00
|
|
|
(package
|
2018-03-13 19:06:53 +00:00
|
|
|
(name "rust")
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(version "1.19.0")
|
2019-05-02 11:11:06 +00:00
|
|
|
(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))
|
2020-07-17 13:22:57 +00:00
|
|
|
(patches (search-patches "rust-1.19-mrustc.patch"))))
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(outputs '("out" "cargo"))
|
2018-12-12 00:15:01 +00:00
|
|
|
(properties '((timeout . 72000) ;20 hours
|
|
|
|
(max-silent-time . 18000))) ;5 hours (for armel)
|
2016-09-28 14:24:20 +00:00
|
|
|
(arguments
|
2019-08-12 11:04:31 +00:00
|
|
|
`(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
|
2018-09-01 17:31:45 +00:00
|
|
|
#:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system))
|
2017-12-10 21:14:01 +00:00
|
|
|
#:phases
|
2016-09-28 14:24:20 +00:00
|
|
|
(modify-phases %standard-phases
|
|
|
|
(add-after 'unpack 'set-env
|
2018-04-15 08:05:14 +00:00
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
;; Disable test for cross compilation support.
|
|
|
|
(setenv "CFG_DISABLE_CROSS_TESTS" "1")
|
2016-09-28 14:24:20 +00:00
|
|
|
(setenv "SHELL" (which "sh"))
|
2017-03-22 11:45:48 +00:00
|
|
|
(setenv "CONFIG_SHELL" (which "sh"))
|
2018-04-15 08:05:14 +00:00
|
|
|
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
2017-12-10 21:14:01 +00:00
|
|
|
;; guix llvm-3.9.1 package installs only shared libraries
|
|
|
|
(setenv "LLVM_LINK_SHARED" "1")
|
2017-03-22 11:45:48 +00:00
|
|
|
#t))
|
2018-09-01 17:31:45 +00:00
|
|
|
(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))
|
2017-03-18 09:31:26 +00:00
|
|
|
(add-after 'unpack 'patch-tests
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
2017-03-22 16:40:06 +00:00
|
|
|
(let ((bash (assoc-ref inputs "bash")))
|
|
|
|
(substitute* "src/libstd/process.rs"
|
2017-06-17 18:37:01 +00:00
|
|
|
;; The newline is intentional.
|
|
|
|
;; There's a line length "tidy" check in Rust which would
|
|
|
|
;; fail otherwise.
|
2017-12-10 21:14:01 +00:00
|
|
|
(("\"/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>
|
2017-06-17 18:37:01 +00:00
|
|
|
(substitute* "src/libstd/sys/unix/process/process_common.rs"
|
2018-04-15 21:45:34 +00:00
|
|
|
(("fn test_process_mask") "#[allow(unused_attributes)]
|
|
|
|
#[ignore]
|
2018-04-15 08:16:41 +00:00
|
|
|
fn test_process_mask"))
|
2017-03-22 16:40:06 +00:00
|
|
|
#t)))
|
2018-07-04 14:27:11 +00:00
|
|
|
(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))
|
2017-12-10 21:14:01 +00:00
|
|
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
2018-03-13 19:06:53 +00:00
|
|
|
(lambda* _
|
2019-08-14 09:09:03 +00:00
|
|
|
(use-modules (guix build cargo-utils))
|
2017-12-10 21:14:01 +00:00
|
|
|
(substitute* "src/Cargo.lock"
|
|
|
|
(("(\"checksum .* = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
2019-08-12 11:04:31 +00:00
|
|
|
(generate-all-checksums "src/vendor")
|
2017-12-10 21:14:01 +00:00
|
|
|
#t))
|
2018-09-01 17:31:45 +00:00
|
|
|
;; This phase is overridden by newer versions.
|
2016-09-28 14:24:20 +00:00
|
|
|
(replace 'configure
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(const #t))
|
2018-09-01 17:31:45 +00:00
|
|
|
;; 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.19.0-stable-mrustc")
|
2020-01-21 19:30:06 +00:00
|
|
|
(setenv "MRUSTC_TARGET_VER" ,(version-major+minor version))
|
2018-09-01 17:31:45 +00:00
|
|
|
; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path.
|
|
|
|
(mkdir-p "output")
|
2020-01-21 19:30:06 +00:00
|
|
|
;; mrustc 0.9 doesn't check the search paths for crates anymore.
|
|
|
|
(copy-recursively (string-append rustc-bootstrap "/lib/mrust")
|
|
|
|
"output")
|
2018-09-01 17:31:45 +00:00
|
|
|
(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")
|
2018-09-12 15:41:31 +00:00
|
|
|
(for-each (match-lambda
|
2018-09-01 17:31:45 +00:00
|
|
|
((name . flags)
|
|
|
|
(write name)
|
|
|
|
(newline)
|
|
|
|
(apply invoke
|
|
|
|
"output/rustc-build/rustc"
|
|
|
|
"-C" (string-append "linker="
|
|
|
|
(getenv "CC"))
|
2018-09-19 12:38:10 +00:00
|
|
|
;; Required for libterm.
|
|
|
|
"-Z" "force-unstable-if-unmarked"
|
2018-09-01 17:31:45 +00:00
|
|
|
"-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")
|
2018-09-19 12:38:10 +00:00
|
|
|
("libarena")
|
|
|
|
|
|
|
|
;; Test dependencies:
|
|
|
|
|
|
|
|
("libgetopts")
|
|
|
|
("libterm")
|
|
|
|
("libtest")))
|
2018-09-01 17:31:45 +00:00
|
|
|
#t)))
|
|
|
|
;; This phase is overridden by newer versions.
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(replace 'check
|
|
|
|
(const #t))
|
2018-09-01 17:31:45 +00:00
|
|
|
;; This phase is overridden by newer versions.
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(replace 'install
|
2018-09-01 17:31:45 +00:00
|
|
|
(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"))
|
2018-09-12 20:52:08 +00:00
|
|
|
(install-file "output/rustc-build/rustdoc"
|
|
|
|
(string-append out "/bin"))
|
2018-09-01 17:31:45 +00:00
|
|
|
(install-file "output/cargo-build/cargo"
|
|
|
|
(string-append (assoc-ref outputs "cargo")
|
|
|
|
"/bin")))
|
|
|
|
#t)))))
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
(native-inputs
|
|
|
|
`(("bison" ,bison) ; For the tests
|
2019-06-17 15:24:24 +00:00
|
|
|
("cmake" ,cmake-minimal)
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
("flex" ,flex) ; For the tests
|
2020-07-02 21:27:14 +00:00
|
|
|
;; 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
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
("procps" ,procps) ; For the tests
|
|
|
|
("python-2" ,python-2)
|
2018-09-01 17:31:45 +00:00
|
|
|
("rustc-bootstrap" ,mrustc)
|
|
|
|
("cargo-bootstrap" ,mrustc "cargo")
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
("pkg-config" ,pkg-config) ; For "cargo"
|
|
|
|
("which" ,which)))
|
|
|
|
(inputs
|
|
|
|
`(("jemalloc" ,jemalloc-4.5.0)
|
|
|
|
("llvm" ,llvm-3.9.1)
|
2019-03-01 16:52:57 +00:00
|
|
|
("openssl" ,openssl-1.0)
|
2018-10-15 21:32:11 +00:00
|
|
|
("libssh2" ,libssh2) ; For "cargo"
|
|
|
|
("libcurl" ,curl))) ; For "cargo"
|
2018-05-09 22:27:17 +00:00
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
;; rustc invokes gcc, so we need to set its search paths accordingly.
|
2018-05-09 22:27:17 +00:00
|
|
|
;; 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
|
2020-02-07 22:26:38 +00:00
|
|
|
(variable "C_INCLUDE_PATH")
|
2018-05-09 22:27:17 +00:00
|
|
|
(files '("include")))
|
2020-02-07 22:26:38 +00:00
|
|
|
(search-path-specification
|
|
|
|
(variable "CPLUS_INCLUDE_PATH")
|
|
|
|
(files '("include/c++" "include")))
|
2018-05-09 22:27:17 +00:00
|
|
|
(search-path-specification
|
|
|
|
(variable "LIBRARY_PATH")
|
2020-07-15 21:19:57 +00:00
|
|
|
(files '("lib" "lib64")))))
|
2018-05-09 22:27:17 +00:00
|
|
|
|
2020-12-18 15:15:16 +00:00
|
|
|
(supported-systems '("x86_64-linux"))
|
gnu: Fix typoes in package descriptions.
* gnu/packages/audio.scm (caps-plugins-lv2)[synopsis]: Fix typo.
* gnu/packages/bioconductor.scm (r-karyoploter, r-anota, r-gcrma)
(r-bigmemoryextras)[description]: Likewise.
* gnu/packages/cran.scm (r-geometry)[synopsis]: Likewise.
(r-stringdist, r-patchwork, r-depth, r-tea)[description]: Likewise.
* gnu/packages/crates-io.scm (rust-assert-fs-0.11, rust-notify-4)
(rust-tokio-fs-0.1)[synopsis, description]: Likewise.
(rust-blas-sys-0.7)[description]: Likewise.
(rust-fs-extra-1.1, rust-xattr-0.2)[synopsis]: Likewise.
* gnu/packages/databases.scm (perl-mysql-config)[description]: Likewise.
* gnu/packages/disk.scm (hddtemp)[description]: Likewise.
* gnu/packages/django.scm (python-djangorestframework)[description]:
Likewise.
* gnu/packages/documentation.scm (doc++)[description]: Likewise.
* gnu/packages/emacs-xyz.scm (emacs-kakoune, emacs-pyim-basedict, eless)
(emacs-scpaste)[description]: Likewise.
* gnu/packages/file-systems.scm (dbxfs)[description]: Likewise.
* gnu/packages/finance.scm (python-stdnum)[description]: Likewise.
* gnu/packages/fontutils.scm (woff2)[description]: Likewise.
* gnu/packages/games.scm (openttd-opengfx)[description]: Likewise.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-topicons-redux)
[description]: Likewise.
* gnu/packages/gnome.scm (libgrss)[description]: Likewise.
* gnu/packages/golang.scm (go-github-com-mitchellh-reflectwalk)
[description]: Likewise.
(go-github-com-go-git-go-billy)[synopsis, description]: Likewise.
* gnu/packages/haskell-check.scm (ghc-inspection-testing)[description]:
Likewise.
* gnu/packages/haskell-web.scm (ghc-yesod-form)[description]: Likewise.
* gnu/packages/haskell-xyz.scm (ghc-hex)[description]: Likewise.
* gnu/packages/hyperledger.scm (hyperledger-iroha-ed25519)[description]:
Likewise.
* gnu/packages/java.scm (java-mail)[synopsis]: Likewise.
(java-native-access-platform)[description]: Likewise.
* gnu/packages/kde-frameworks.scm (kactivities-stats)[description]:
Likewise.
* gnu/packages/kde-utils.scm (krusader)[description]: Likewise.
* gnu/packages/language.scm (praat)[description]: Likewise.
* gnu/packages/linux.scm (light)[description]: Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.defclass-star)[description]:
Likewise.
* gnu/packages/mail.scm (dovecot-trees, sieve-connect)[description]:
Likewise.
* gnu/packages/ocaml.scm (ocaml-opam-file-format, ocaml-cppo)
(ocaml4.07-ppx-variants-conv)[description]: Likewise.
* gnu/packages/perl.scm (perl-convert-binhex)[description]: Likewise.
* gnu/packages/python-crypto.scm (python-ecdsa)[description]: Likewise.
* gnu/packages/python-web.scm (python-html5lib)[synopsis, description]:
Likewise.
(python-venusian)[synopsis]: Likewise.
* gnu/packages/python-xyz.scm (python-readlike, python-gssapi)
(python-flufl-i18n)[description]: Likewise.
(python-pox, python-watchdog, python-xattr)[synopsis, description]:
Likewise.
* gnu/packages/ruby.scm (ruby-sorcerer)[description]: Likewise.
* gnu/packages/rust-apps.scm (watchexec)[description]: Likewise.
* gnu/packages/rust.scm (mrustc)[synopsis]: Likewise.
* gnu/packages/shells.scm (s-shell)[description]: Likewise.
* gnu/packages/ssh.scm (sshpass)[description]: Likewise.
* gnu/packages/terminals.scm (beep)[description]: Likewise.
* gnu/packages/web.scm (perl-lwp-useragent-cached)[description]:
Likewise.
* gnu/packages/wv.scm (wv)[description]: Likewise.
2020-09-22 19:31:52 +00:00
|
|
|
(synopsis "Compiler for the Rust programming language")
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(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))))
|
|
|
|
|
2018-09-12 21:15:27 +00:00
|
|
|
(define-public rust-1.20
|
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.19 "1.20.0"
|
2018-09-12 21:15:27 +00:00
|
|
|
"0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet '(begin
|
|
|
|
(delete-file-recursively "src/jemalloc")
|
|
|
|
(delete-file-recursively "src/llvm")
|
|
|
|
#t))
|
|
|
|
(patches '())))
|
2020-03-30 13:07:49 +00:00
|
|
|
(native-inputs
|
|
|
|
`(;; The tests fail with newer versions of GNU Make.
|
|
|
|
("make" ,gnu-make-4.2)
|
|
|
|
,@(package-native-inputs base-rust)))
|
2018-09-12 21:15:27 +00:00
|
|
|
(outputs '("out" "doc" "cargo"))
|
2019-03-17 09:59:56 +00:00
|
|
|
;; 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)
|
2018-09-12 21:15:27 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments rust-1.19)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2018-09-20 20:12:10 +00:00
|
|
|
(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"))
|
2018-11-22 13:27:55 +00:00
|
|
|
|
|
|
|
;; 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"))
|
2018-09-20 20:12:10 +00:00
|
|
|
#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))
|
2018-09-12 21:15:27 +00:00
|
|
|
(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 = \"" cargo "/bin/cargo" "\"
|
|
|
|
rustc = \"" rustc "/bin/rustc" "\"
|
|
|
|
docs = true
|
|
|
|
python = \"" python "/bin/python2" "\"
|
|
|
|
gdb = \"" gdb "/bin/gdb" "\"
|
|
|
|
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" "\"
|
|
|
|
cxx = \"" gcc "/bin/g++" "\"
|
2018-09-22 08:07:50 +00:00
|
|
|
ar = \"" binutils "/bin/ar" "\"
|
2018-09-12 21:15:27 +00:00
|
|
|
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)
|
2018-09-20 20:16:45 +00:00
|
|
|
;; Rust 1.20.0 treats timestamp 0 as "file doesn't exist".
|
|
|
|
;; Therefore, use timestamp 1.
|
|
|
|
(utime filename 1 1 1 1))
|
2018-09-12 21:15:27 +00:00
|
|
|
(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")))
|
2019-05-02 10:38:13 +00:00
|
|
|
(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"
|
2020-09-25 19:24:46 +00:00
|
|
|
,(string-append "manifest-rust-std-"
|
|
|
|
(nix-system->gnu-triplet-for-rust))
|
2019-05-02 10:38:13 +00:00
|
|
|
"manifest-rustc"))
|
|
|
|
(for-each
|
|
|
|
(lambda (file) (delete-manifest-file cargo-out file))
|
|
|
|
'("install.log"
|
|
|
|
"manifest-cargo"))
|
|
|
|
#t)))
|
2018-09-12 21:15:27 +00:00
|
|
|
(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))))))))))
|
|
|
|
|
2018-09-12 22:53:22 +00:00
|
|
|
(define-public rust-1.21
|
2019-05-02 11:11:06 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.20 "1.21.0"
|
2018-09-22 23:19:53 +00:00
|
|
|
"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)))))))))
|
2018-09-12 22:53:22 +00:00
|
|
|
|
2018-09-12 22:55:33 +00:00
|
|
|
(define-public rust-1.22
|
2019-05-02 11:11:06 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.21 "1.22.1"
|
2018-12-02 13:13:48 +00:00
|
|
|
"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)))))))))
|
2018-09-12 22:55:33 +00:00
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 17:15:06 +00:00
|
|
|
(define-public rust-1.23
|
2019-05-02 11:11:06 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0"
|
2018-09-23 22:40:58 +00:00
|
|
|
"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)))))))))
|
2016-12-10 13:04:12 +00:00
|
|
|
|
2018-04-15 08:11:37 +00:00
|
|
|
(define-public rust-1.24
|
2018-04-02 16:47:58 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.23 "1.24.1"
|
2019-03-28 23:38:02 +00:00
|
|
|
"1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y")))
|
2018-03-13 19:06:53 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
2018-04-02 16:47:58 +00:00
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
2018-07-04 14:27:11 +00:00
|
|
|
(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"))
|
2018-09-20 20:16:45 +00:00
|
|
|
#t)))))))))
|
2018-04-15 08:11:37 +00:00
|
|
|
|
2018-10-15 21:32:11 +00:00
|
|
|
;;; 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
|
2018-07-04 14:27:11 +00:00
|
|
|
(define-public rust-1.25
|
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.24 "1.25.0"
|
|
|
|
"0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf")))
|
2018-04-15 08:11:37 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(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))
|
2020-07-17 13:22:57 +00:00
|
|
|
(patches (search-patches
|
|
|
|
"rust-1.25-accept-more-detailed-gdb-lines.patch"))))
|
2018-04-15 08:11:37 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'patch-cargo-tests 'patch-cargo-index-update
|
2018-07-15 18:49:21 +00:00
|
|
|
(lambda _
|
2018-04-15 08:11:37 +00:00
|
|
|
(substitute* "src/tools/cargo/tests/generate-lockfile.rs"
|
|
|
|
;; This test wants to update the crate index.
|
2018-07-15 18:49:21 +00:00
|
|
|
(("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))
|
2018-07-04 14:27:11 +00:00
|
|
|
(delete 'ignore-glibc-2.27-incompatible-test))))))))
|
|
|
|
|
2018-06-30 09:34:49 +00:00
|
|
|
(define-public rust-1.26
|
2018-07-04 14:27:11 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.25 "1.26.2"
|
|
|
|
"0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv")))
|
2018-07-04 14:27:11 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2020-07-17 13:22:57 +00:00
|
|
|
(patches (search-patches
|
|
|
|
"rust-coresimd-doctest.patch"
|
|
|
|
"rust-1.25-accept-more-detailed-gdb-lines.patch"))))
|
2020-07-29 05:07:24 +00:00
|
|
|
(inputs
|
|
|
|
(alist-replace "openssl" (list openssl)
|
|
|
|
(package-inputs base-rust)))
|
2018-07-04 14:27:11 +00:00
|
|
|
(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)
|
2019-04-03 17:00:44 +00:00
|
|
|
(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"))))
|
2018-07-04 14:27:11 +00:00
|
|
|
(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"))
|
2018-11-22 13:27:55 +00:00
|
|
|
|
|
|
|
;; 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"))
|
2018-07-04 14:27:11 +00:00
|
|
|
#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)))))))))
|
2018-06-30 09:34:49 +00:00
|
|
|
|
2018-10-15 21:37:41 +00:00
|
|
|
(define-public rust-1.27
|
2018-06-30 09:34:49 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.26 "1.27.2"
|
|
|
|
"0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs")))
|
2018-06-30 09:34:49 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2020-07-17 13:22:57 +00:00
|
|
|
(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"))))
|
2018-06-30 09:34:49 +00:00
|
|
|
(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"))
|
2018-10-15 21:32:11 +00:00
|
|
|
#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"))
|
2018-06-30 09:34:49 +00:00
|
|
|
#t)))))))))
|
2018-10-15 21:37:41 +00:00
|
|
|
|
2019-01-28 06:50:46 +00:00
|
|
|
(define-public rust-1.28
|
2018-10-15 21:37:41 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.27 "1.28.0"
|
|
|
|
"11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx")))
|
2018-10-15 21:37:41 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2020-07-17 13:22:57 +00:00
|
|
|
(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"))))
|
2018-10-15 21:37:41 +00:00
|
|
|
(inputs
|
|
|
|
;; Use LLVM 6.0
|
2019-02-20 22:50:28 +00:00
|
|
|
(alist-replace "llvm" (list llvm-6)
|
2018-10-15 21:37:41 +00:00
|
|
|
(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))
|
2020-07-28 07:55:03 +00:00
|
|
|
;; This is no longer needed as of 1.28
|
|
|
|
(delete 'disable-cargo-test-for-nightly-channel)
|
2018-10-15 21:37:41 +00:00
|
|
|
;; The thinlto test should pass with llvm 6.
|
|
|
|
(delete 'disable-thinlto-test))))))))
|
2019-01-28 06:50:46 +00:00
|
|
|
|
2019-02-28 03:53:21 +00:00
|
|
|
(define-public rust-1.29
|
2019-01-28 06:50:46 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.28 "1.29.2"
|
|
|
|
"1jb787080z754caa2w3w1amsygs4qlzj9rs1vy64firfmabfg22h")))
|
2019-01-28 06:50:46 +00:00
|
|
|
(package
|
2019-05-02 11:11:06 +00:00
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2020-07-17 13:22:57 +00:00
|
|
|
(patches (search-patches "rust-1.25-accept-more-detailed-gdb-lines.patch"
|
|
|
|
"rust-reproducible-builds.patch")))))))
|
2019-02-28 03:53:21 +00:00
|
|
|
|
|
|
|
(define-public rust-1.30
|
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.29 "1.30.1"
|
|
|
|
"0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn")))
|
2019-02-28 03:53:21 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(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")
|
2019-06-18 02:36:10 +00:00
|
|
|
#t))))
|
2019-02-28 03:53:21 +00:00
|
|
|
(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))
|
2019-03-28 23:43:10 +00:00
|
|
|
;; The test has been moved elsewhere.
|
|
|
|
(replace 'disable-amd64-avx-test
|
|
|
|
(lambda _
|
|
|
|
(substitute* "src/test/ui/run-pass/issues/issue-44056.rs"
|
2020-03-08 13:09:36 +00:00
|
|
|
(("only-x86_64") "ignore-test"))
|
2019-03-28 23:43:10 +00:00
|
|
|
#t)))))))))
|
2019-02-28 03:53:21 +00:00
|
|
|
|
2020-03-08 13:09:36 +00:00
|
|
|
(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)))
|
|
|
|
|
2019-03-28 23:46:10 +00:00
|
|
|
(define-public rust-1.31
|
2019-02-28 03:53:21 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:11:06 +00:00
|
|
|
(rust-bootstrapped-package rust-1.30 "1.31.1"
|
|
|
|
"0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli")))
|
2019-02-28 03:53:21 +00:00
|
|
|
(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
|
2020-03-08 13:09:36 +00:00
|
|
|
,(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))
|
2019-02-28 03:53:21 +00:00
|
|
|
(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)))))))))
|
2019-03-28 23:46:10 +00:00
|
|
|
|
2019-04-03 02:33:21 +00:00
|
|
|
(define-public rust-1.32
|
2019-03-28 23:46:10 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.31 "1.32.0"
|
2019-05-02 11:11:06 +00:00
|
|
|
"0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac")))
|
2019-03-28 23:46:10 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(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))
|
2020-07-17 13:22:57 +00:00
|
|
|
(patches (search-patches "rust-reproducible-builds.patch"))
|
2019-05-02 11:11:06 +00:00
|
|
|
;; the vendor directory has moved to the root of
|
|
|
|
;; the tarball, so we have to strip an extra prefix
|
|
|
|
(patch-flags '("-p2"))))
|
2019-03-28 23:46:10 +00:00
|
|
|
(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* _
|
2019-08-14 09:09:03 +00:00
|
|
|
(use-modules (guix build cargo-utils))
|
2019-03-28 23:46:10 +00:00
|
|
|
(substitute* "Cargo.lock"
|
|
|
|
(("(\"checksum .* = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
2019-08-12 11:04:31 +00:00
|
|
|
(generate-all-checksums "vendor")
|
2019-03-28 23:46:10 +00:00
|
|
|
#t))
|
|
|
|
(add-after 'enable-codegen-tests '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
|
|
|
|
;; jemalloc source). To use jemalloc we must enable linking to
|
|
|
|
;; it (otherwise it would use the system allocator), and set
|
|
|
|
;; an environment variable pointing to the compiled jemalloc.
|
|
|
|
(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))))))))
|
2019-04-03 02:33:21 +00:00
|
|
|
|
|
|
|
(define-public rust-1.33
|
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.32 "1.33.0"
|
2019-05-02 11:11:06 +00:00
|
|
|
"152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as")))
|
2019-04-03 02:33:21 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-05-02 11:11:06 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(patches '())
|
|
|
|
(patch-flags '("-p1"))))
|
2019-04-03 02:33:21 +00:00
|
|
|
(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)))))))))
|
|
|
|
|
2019-05-23 03:50:47 +00:00
|
|
|
(define-public rust-1.34
|
2019-04-14 16:54:58 +00:00
|
|
|
(let ((base-rust
|
2019-05-02 11:21:26 +00:00
|
|
|
(rust-bootstrapped-package rust-1.33 "1.34.1"
|
|
|
|
"19s09k7y5j6g3y4d2rk6kg9pvq6ml94c49w6b72dmq8p9lk8bixh")))
|
2019-04-14 16:54:58 +00:00
|
|
|
(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)))))))
|
2019-05-23 03:50:47 +00:00
|
|
|
|
2019-07-05 05:43:17 +00:00
|
|
|
(define-public rust-1.35
|
2019-05-23 03:50:47 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.34 "1.35.0"
|
|
|
|
"0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2019-06-18 05:10:52 +00:00
|
|
|
(inputs
|
|
|
|
(alist-replace "llvm" (list llvm-8)
|
|
|
|
(package-inputs base-rust)))
|
2019-05-23 03:50:47 +00:00
|
|
|
(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)))))))))
|
2019-07-05 05:43:17 +00:00
|
|
|
|
2019-08-11 22:07:05 +00:00
|
|
|
(define-public rust-1.36
|
2019-07-05 05:43:17 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.35 "1.36.0"
|
2019-07-12 12:54:33 +00:00
|
|
|
"06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04")))
|
2019-07-05 05:43:17 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(delete 'patch-process-docs-rev-cmd))))))))
|
2019-08-11 22:07:05 +00:00
|
|
|
|
2020-03-08 13:09:36 +00:00
|
|
|
(define-public rust-1.37
|
2019-08-11 22:07:05 +00:00
|
|
|
(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))))))))))
|
2020-03-08 13:09:36 +00:00
|
|
|
|
|
|
|
(define-public rust-1.38
|
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.37 "1.38.0"
|
|
|
|
"101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2020-07-28 07:57:13 +00:00
|
|
|
(inputs
|
2020-03-09 08:16:13 +00:00
|
|
|
(alist-replace "llvm" (list llvm-9)
|
|
|
|
(package-inputs base-rust)))
|
2020-03-08 13:09:36 +00:00
|
|
|
(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)))))))))
|
|
|
|
|
2020-03-08 22:32:35 +00:00
|
|
|
(define-public rust-1.39
|
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.38 "1.39.0"
|
|
|
|
"0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(replace 'patch-cargo-checksums
|
|
|
|
;; The Cargo.lock format changed.
|
|
|
|
(lambda* _
|
|
|
|
(use-modules (guix build cargo-utils))
|
|
|
|
(substitute* "Cargo.lock"
|
|
|
|
(("(checksum = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
|
|
|
(generate-all-checksums "vendor")
|
|
|
|
#t)))))))))
|
|
|
|
|
2020-03-09 08:16:13 +00:00
|
|
|
(define-public rust-1.40
|
|
|
|
(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)))))))))
|
|
|
|
|
|
|
|
(define-public rust-1.41
|
|
|
|
(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))))))
|
|
|
|
|
|
|
|
(define-public rust-1.42
|
|
|
|
(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"))
|
|
|
|
|
|
|
|
(define-public rust-1.44
|
|
|
|
(rust-bootstrapped-package rust-1.43 "1.44.1"
|
|
|
|
"0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"))
|
|
|
|
|
2020-07-15 20:02:24 +00:00
|
|
|
(define-public rust-1.45
|
|
|
|
(let ((base-rust
|
2020-08-03 15:57:33 +00:00
|
|
|
(rust-bootstrapped-package rust-1.44 "1.45.2"
|
|
|
|
"0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp")))
|
2020-07-15 20:02:24 +00:00
|
|
|
(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)))))))))
|
2020-03-09 08:16:13 +00:00
|
|
|
|
2020-09-07 07:38:03 +00:00
|
|
|
(define-public rust-1.46
|
2020-12-02 13:18:35 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.45 "1.46.0"
|
|
|
|
"0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(outputs (cons "rustfmt" (package-outputs base-rust)))
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#: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")))
|
|
|
|
(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"))))
|
|
|
|
(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")
|
|
|
|
(substitute* "config.toml"
|
|
|
|
;; replace prefix to specific 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))))))))))
|
2020-09-07 07:38:03 +00:00
|
|
|
|
2020-12-07 00:03:09 +00:00
|
|
|
(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)))))))))
|
|
|
|
|
2020-12-07 22:47:39 +00:00
|
|
|
(define-public rust-1.48
|
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package rust-1.47 "1.48.0"
|
|
|
|
"0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")))
|
|
|
|
(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"))))
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
;; Some tests got split out into separate files.
|
|
|
|
(replace 'patch-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\"")))
|
|
|
|
(substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
|
|
|
|
(("fn test_process_mask") "#[allow(unused_attributes)]
|
|
|
|
#[ignore]
|
|
|
|
fn test_process_mask"))
|
|
|
|
#t))))))))))
|
|
|
|
|
2021-01-02 18:11:27 +00:00
|
|
|
(define-public rust-1.49
|
|
|
|
(rust-bootstrapped-package rust-1.48 "1.49.0"
|
|
|
|
"0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))
|
|
|
|
|
2021-02-13 15:41:37 +00:00
|
|
|
(define-public rust-1.50
|
|
|
|
(rust-bootstrapped-package rust-1.49 "1.50.0"
|
|
|
|
"0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm"))
|
|
|
|
|
2020-03-09 08:16:13 +00:00
|
|
|
;; TODO(staging): Bump this variable to the latest packaged rust.
|
2020-07-27 07:06:03 +00:00
|
|
|
(define-public rust rust-1.45)
|