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>
|
2024-01-10 09:25:25 +00:00
|
|
|
;;; Copyright © 2017, 2019-2024 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>
|
2021-07-05 03:44:00 +00:00
|
|
|
;;; Copyright © 2020 Matthew James Kraai <kraai@ftbfs.org>
|
2020-08-18 18:59:03 +00:00
|
|
|
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
2021-12-25 19:54:22 +00:00
|
|
|
;;; Copyright © 2021 (unmatched parenthesis <paren@disroot.org>
|
2022-01-22 04:37:10 +00:00
|
|
|
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
|
2022-08-04 01:47:17 +00:00
|
|
|
;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
|
2022-10-20 07:06:05 +00:00
|
|
|
;;; Copyright © 2022 Mark H Weaver <mhw@netris.org>
|
2023-07-24 05:36:30 +00:00
|
|
|
;;; Copyright © 2023 Fries <fries1234@protonmail.com>
|
2023-10-15 15:33:24 +00:00
|
|
|
;;; Copyright © 2023 Herman Rimm <herman_rimm@protonmail.com>
|
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)
|
2023-11-20 10:21:03 +00:00
|
|
|
#:use-module (gnu packages cross-base)
|
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)
|
2024-01-12 10:57:30 +00:00
|
|
|
#:use-module (gnu packages libffi)
|
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)
|
2024-03-06 11:06:08 +00:00
|
|
|
#:use-module (gnu packages llvm-meta)
|
2023-11-20 10:21:03 +00:00
|
|
|
#:use-module (gnu packages mingw)
|
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)
|
2024-01-12 10:57:30 +00:00
|
|
|
#:use-module (gnu packages web)
|
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)
|
2023-10-28 13:39:33 +00:00
|
|
|
#:use-module (guix build-system trivial)
|
2024-01-12 10:55:51 +00:00
|
|
|
#:use-module (guix search-paths)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (guix download)
|
2024-01-05 16:40:49 +00:00
|
|
|
#:use-module (guix memoization)
|
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)
|
2023-12-17 15:09:31 +00:00
|
|
|
#:use-module (guix platform)
|
2018-03-13 19:06:53 +00:00
|
|
|
#:use-module ((guix build utils) #:select (alist-replace))
|
|
|
|
#:use-module (guix utils)
|
2023-10-28 13:39:33 +00:00
|
|
|
#:use-module (guix gexp)
|
2016-09-22 13:04:14 +00:00
|
|
|
#:use-module (ice-9 match)
|
2023-11-20 10:21:03 +00:00
|
|
|
#:use-module (ice-9 optargs)
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
#:use-module (srfi srfi-1)
|
2024-07-05 12:45:13 +00:00
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
#:use-module (srfi srfi-35))
|
2016-09-22 13:04:14 +00:00
|
|
|
|
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
|
|
|
|
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
|
2021-01-31 21:49:25 +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))))))
|
|
|
|
|
2020-08-18 18:59:03 +00:00
|
|
|
;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
|
2022-03-26 13:21:17 +00:00
|
|
|
;;; to be used in source form.
|
2024-01-10 09:25:25 +00:00
|
|
|
(define %mrustc-commit "b6754f574f8846eb842feba4ccbeeecb10bdfacc")
|
2020-08-18 18:59:03 +00:00
|
|
|
(define %mrustc-source
|
2024-01-10 09:25:25 +00:00
|
|
|
(let* ((version "0.10.1")
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(commit %mrustc-commit)
|
2024-01-10 09:25:25 +00:00
|
|
|
(revision "1")
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(name "mrustc"))
|
2020-08-18 18:59:03 +00:00
|
|
|
(origin
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
|
|
|
(url "https://github.com/thepowersgang/mrustc")
|
2024-01-10 09:25:25 +00:00
|
|
|
(commit (string-append "v" version))))
|
|
|
|
(file-name (git-file-name name version))
|
2020-08-18 18:59:03 +00:00
|
|
|
(sha256
|
|
|
|
(base32
|
2024-01-10 09:25:25 +00:00
|
|
|
"0rqiif7rb5hg6ik3i1flldj311f014q4n9z8wb50cs8kspjz32di"))
|
2022-10-20 07:06:05 +00:00
|
|
|
(modules '((guix build utils)))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
;; Drastically reduces memory and build time requirements
|
|
|
|
;; by disabling debug by default.
|
|
|
|
(substitute* (find-files "." "Makefile")
|
2024-01-10 09:25:25 +00:00
|
|
|
(("LINKFLAGS := -g") "LINKFLAGS :=")
|
2022-10-20 07:06:05 +00:00
|
|
|
(("-g ") "")))))))
|
2020-08-18 18:59:03 +00:00
|
|
|
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
;;; Rust 1.54 is special in that it is built with mrustc, which shortens the
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
;;; bootstrap path.
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-bootstrap
|
2020-08-18 18:59:03 +00:00
|
|
|
(package
|
|
|
|
(name "rust")
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(version "1.54.0")
|
2020-08-18 18:59:03 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (rust-uri version))
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(sha256 (base32 "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"))
|
2020-08-18 18:59:03 +00:00
|
|
|
(modules '((guix build utils)))
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
2024-01-12 10:52:06 +00:00
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
2023-02-17 08:33:05 +00:00
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
(delete-file "vendor/vte/vim10m_match")
|
2023-03-14 11:57:47 +00:00
|
|
|
(delete-file "vendor/vte/vim10m_table")
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
;; find vendor -not -type d -exec file {} \+ | grep PE32
|
|
|
|
(for-each delete-file
|
2024-01-12 10:52:06 +00:00
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(patches (search-patches "rustc-1.54.0-src.patch"))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(patch-flags '("-p0")))) ;default is -p1
|
2020-08-18 18:59:03 +00:00
|
|
|
(outputs '("out" "cargo"))
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(properties '((hidden? . #t)
|
2024-01-17 08:13:45 +00:00
|
|
|
(timeout . 129600) ;36 hours
|
2020-08-18 18:59:03 +00:00
|
|
|
(max-silent-time . 18000))) ;5 hours (for armel)
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(inputs
|
2024-01-17 08:13:45 +00:00
|
|
|
`(,@(if (or (target-ppc64le?)
|
|
|
|
(target-riscv64?))
|
2024-01-15 15:39:39 +00:00
|
|
|
`(("clang" ,clang-13))
|
|
|
|
`())
|
|
|
|
("llvm" ,llvm-13)
|
2022-08-30 17:08:00 +00:00
|
|
|
("openssl" ,openssl-1.1)
|
2020-08-18 18:59:03 +00:00
|
|
|
("zlib" ,zlib)))
|
|
|
|
(native-inputs
|
2024-01-10 06:37:09 +00:00
|
|
|
`(("pkg-config" ,pkg-config)
|
2020-08-18 18:59:03 +00:00
|
|
|
;; Required for the libstd sources.
|
|
|
|
("mrustc-source" ,%mrustc-source)))
|
|
|
|
(arguments
|
|
|
|
`(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
|
|
|
|
#:modules ((guix build cargo-utils)
|
|
|
|
(guix build utils)
|
|
|
|
(guix build gnu-build-system))
|
|
|
|
#:test-target "test"
|
|
|
|
;; Rust's own .so library files are not found in any RUNPATH, but
|
|
|
|
;; that doesn't seem to cause issues.
|
|
|
|
#:validate-runpath? #f
|
2023-05-03 13:13:38 +00:00
|
|
|
;; Most of the build is single-threaded. This also improves the
|
|
|
|
;; build time on machines with "only" 8GB of RAM.
|
2024-01-15 15:39:39 +00:00
|
|
|
;; ppc64le regularly sees race conditions between various dependant crates.
|
2023-05-03 13:13:38 +00:00
|
|
|
#:parallel-build? ,(target-x86-64?)
|
2020-08-18 18:59:03 +00:00
|
|
|
#:make-flags
|
|
|
|
(list ,(string-append "RUSTC_TARGET="
|
2023-12-17 15:09:31 +00:00
|
|
|
(platform-rust-target
|
|
|
|
(lookup-platform-by-target-or-system
|
|
|
|
(or (%current-target-system)
|
|
|
|
(%current-system)))))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
,(string-append "RUSTC_VERSION=" version)
|
|
|
|
,(string-append "MRUSTC_TARGET_VER="
|
|
|
|
(version-major+minor version))
|
2023-05-03 13:13:38 +00:00
|
|
|
;; mrustc expects a C11 compatible compiler. Use the default
|
|
|
|
;; C language dialect from the GCC-10 compiler.
|
|
|
|
;; This is necessary for some architectures.
|
|
|
|
"CFLAGS=-std=gnu11"
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
"OUTDIR_SUF=") ;do not add version suffix to output dir
|
2020-08-18 18:59:03 +00:00
|
|
|
#:phases
|
|
|
|
(modify-phases %standard-phases
|
2024-01-15 15:39:39 +00:00
|
|
|
,@(if (target-ppc64le?)
|
|
|
|
`((add-after 'unpack 'patch-sources-for-newer-llvm
|
|
|
|
(lambda _
|
|
|
|
;; Adjust some sources for llvm-13, see llvm commit
|
|
|
|
;; acce401068e78a8c5dc9e06802111ffad3da763f
|
|
|
|
(substitute* (find-files "." "powerpc64le_unknown_linux_gnu.rs")
|
|
|
|
(("e-m:e-i64:64-n32:64-v256:256:256-v512:512:512")
|
|
|
|
"e-m:e-i64:64-n32:64-S128-v256:256:256-v512:512:512")))))
|
|
|
|
'())
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(add-after 'unpack 'setup-mrustc-sources
|
2020-08-18 18:59:03 +00:00
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(copy-recursively (assoc-ref inputs "mrustc-source") "../mrustc")
|
|
|
|
;; The Makefile of mrustc expects the sources directory of rustc
|
|
|
|
;; to be at this location, and it simplifies things to make it
|
|
|
|
;; so.
|
|
|
|
(symlink (getcwd)
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(string-append "../mrustc/rustc-" ,version "-src"))
|
|
|
|
(with-output-to-file "dl-version"
|
|
|
|
(lambda _
|
|
|
|
(format #t "~a~%"
|
|
|
|
,version)))))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(add-after 'setup-mrustc-sources 'patch-makefiles
|
2020-08-18 18:59:03 +00:00
|
|
|
;; This disables building the (unbundled) LLVM.
|
|
|
|
(lambda* (#:key inputs parallel-build? #:allow-other-keys)
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(let ((llvm (assoc-ref inputs "llvm")))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(with-directory-excursion "../mrustc"
|
2020-08-18 18:59:03 +00:00
|
|
|
(substitute* '("minicargo.mk"
|
|
|
|
"run_rustc/Makefile")
|
|
|
|
;; Use the system-provided LLVM.
|
2022-10-20 06:06:51 +00:00
|
|
|
(("LLVM_CONFIG [:|?]= .*")
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n")))
|
|
|
|
(substitute* "minicargo.mk"
|
|
|
|
;; Do not try to fetch sources from the Internet.
|
2024-01-11 06:15:09 +00:00
|
|
|
(("@curl.*") "")
|
|
|
|
(("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)")
|
|
|
|
"$(MINICARGO)"))
|
2020-08-18 18:59:03 +00:00
|
|
|
(substitute* "Makefile"
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
;; Patch date and git obtained version information.
|
|
|
|
((" -D VERSION_GIT_FULLHASH=.*")
|
|
|
|
(string-append
|
|
|
|
" -D VERSION_GIT_FULLHASH=\\\"" ,%mrustc-commit "\\\""
|
|
|
|
" -D VERSION_GIT_BRANCH=\\\"master\\\""
|
|
|
|
" -D VERSION_GIT_SHORTHASH=\\\""
|
|
|
|
,(string-take %mrustc-commit 7) "\\\""
|
|
|
|
" -D VERSION_BUILDTIME="
|
|
|
|
"\"\\\"Thu, 01 Jan 1970 00:00:01 +0000\\\"\""
|
2022-03-26 13:21:17 +00:00
|
|
|
" -D VERSION_GIT_ISDIRTY=0\n")))
|
2020-08-18 18:59:03 +00:00
|
|
|
(substitute* "run_rustc/Makefile"
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
;; Patch the shebang of a generated wrapper for rustc
|
2022-03-26 13:21:17 +00:00
|
|
|
(("#!/bin/sh")
|
|
|
|
(string-append "#!" (which "sh"))))
|
|
|
|
(substitute* "run_rustc/rustc_proxy.sh"
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(("#!/bin/sh")
|
|
|
|
(string-append "#!" (which "sh"))))))))
|
|
|
|
(add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
|
2024-01-11 06:15:09 +00:00
|
|
|
(lambda _
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(substitute* "Cargo.lock"
|
|
|
|
(("(checksum = )\".*\"" all name)
|
2020-08-18 18:59:03 +00:00
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(generate-all-checksums "vendor")))
|
|
|
|
(add-before 'configure 'configure-cargo-home
|
|
|
|
(lambda _
|
|
|
|
(let ((cargo-home (string-append (getcwd) "/.cargo")))
|
|
|
|
(mkdir-p cargo-home)
|
|
|
|
(setenv "CARGO_HOME" cargo-home))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(replace 'configure
|
|
|
|
(lambda _
|
2024-01-17 08:13:45 +00:00
|
|
|
,@(if (or (target-ppc64le?)
|
|
|
|
(target-riscv64?))
|
2024-01-15 15:39:39 +00:00
|
|
|
`((setenv "CC" "clang")
|
|
|
|
(setenv "CXX" "clang++"))
|
|
|
|
`((setenv "CC" "gcc")
|
|
|
|
(setenv "CXX" "g++")))
|
2020-08-18 18:59:03 +00:00
|
|
|
;; The Guix LLVM package installs only shared libraries.
|
|
|
|
(setenv "LLVM_LINK_SHARED" "1")
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
;; rustc still insists on having 'cc' on PATH in some places
|
|
|
|
;; (e.g. when building the 'test' library crate).
|
|
|
|
(mkdir-p "/tmp/bin")
|
|
|
|
(symlink (which "gcc") "/tmp/bin/cc")
|
|
|
|
(setenv "PATH" (string-append "/tmp/bin:" (getenv "PATH")))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(delete 'patch-generated-file-shebangs)
|
|
|
|
(replace 'build
|
|
|
|
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
|
2024-01-11 06:15:09 +00:00
|
|
|
(let ((job-count (if parallel-build?
|
|
|
|
(parallel-job-count)
|
|
|
|
1)))
|
2020-08-18 18:59:03 +00:00
|
|
|
;; Adapted from:
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
;; https://github.com/dtolnay/bootstrap/blob/master/build-1.54.0.sh.
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(chdir "../mrustc")
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
;; Use PARLEVEL since both minicargo and mrustc use it
|
|
|
|
;; to set the level of parallelism.
|
|
|
|
(setenv "PARLEVEL" (number->string job-count))
|
|
|
|
(display "Building mrustc...\n")
|
|
|
|
(apply invoke "make" make-flags)
|
|
|
|
|
|
|
|
;; This doesn't seem to build anything, but it
|
|
|
|
;; sets additional minicargo flags.
|
|
|
|
(display "Building RUSTCSRC...\n")
|
|
|
|
(apply invoke "make" "RUSTCSRC" make-flags)
|
|
|
|
|
|
|
|
;; This probably doesn't need to be called explicitly.
|
|
|
|
(display "Building LIBS...\n")
|
|
|
|
(apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags)
|
|
|
|
|
2024-01-15 15:39:39 +00:00
|
|
|
;; The psm crate FTBFS on ppc64le with gcc.
|
2020-08-18 18:59:03 +00:00
|
|
|
(display "Building rustc...\n")
|
|
|
|
(apply invoke "make" "-f" "minicargo.mk" "output/rustc"
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
make-flags)
|
|
|
|
|
2024-01-15 15:39:39 +00:00
|
|
|
;; We can to continue the build with gcc after building rustc.
|
|
|
|
;; librustc_driver.so undefined reference to
|
|
|
|
;; `llvm::cfg::Update<llvm::BasicBlock*>::dump() const'
|
2024-01-17 08:13:45 +00:00
|
|
|
,@(if (or (target-ppc64le?)
|
|
|
|
(target-riscv64?))
|
2024-01-15 15:39:39 +00:00
|
|
|
`((setenv "CC" "gcc")
|
|
|
|
(setenv "CXX" "g++"))
|
|
|
|
`())
|
|
|
|
|
2020-08-18 18:59:03 +00:00
|
|
|
(display "Building cargo...\n")
|
|
|
|
(apply invoke "make" "-f" "minicargo.mk" "output/cargo"
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
make-flags)
|
|
|
|
|
|
|
|
;; This one isn't listed in the build script.
|
2020-08-18 18:59:03 +00:00
|
|
|
(display "Rebuilding stdlib with rustc...\n")
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(apply invoke "make" "-C" "run_rustc" make-flags))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(replace 'install
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(cargo (assoc-ref outputs "cargo"))
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
(rustc (string-append bin "/rustc"))
|
|
|
|
(cargo-bin (string-append cargo "/bin"))
|
|
|
|
(lib (string-append out "/lib"))
|
2023-12-17 15:09:31 +00:00
|
|
|
(system-lib-prefix
|
|
|
|
(string-append lib "/rustlib/"
|
|
|
|
,(platform-rust-target
|
|
|
|
(lookup-platform-by-target-or-system
|
|
|
|
(or (%current-target-system)
|
|
|
|
(%current-system)))) "/lib")))
|
2020-08-18 18:59:03 +00:00
|
|
|
(mkdir-p (dirname rustc))
|
|
|
|
(copy-file "run_rustc/output/prefix/bin/rustc_binary" rustc)
|
|
|
|
(wrap-program rustc
|
|
|
|
`("LD_LIBRARY_PATH" = (,system-lib-prefix)))
|
|
|
|
(mkdir-p lib)
|
|
|
|
(copy-recursively "run_rustc/output/prefix/lib" lib)
|
|
|
|
(install-file "run_rustc/output/prefix/bin/cargo" cargo-bin)))))))
|
|
|
|
(synopsis "Compiler for the Rust programming language")
|
|
|
|
(description "Rust is a systems programming language that provides memory
|
|
|
|
safety and thread safety guarantees.")
|
|
|
|
(home-page "https://github.com/thepowersgang/mrustc")
|
2021-11-27 21:27:09 +00:00
|
|
|
|
2022-07-10 17:18:05 +00:00
|
|
|
;; The intermediate generated code is known to be inefficient and
|
|
|
|
;; therefore the build process needs 8GB of RAM while building.
|
|
|
|
;; It may support i686 soon:
|
2021-11-27 21:27:09 +00:00
|
|
|
;; <https://github.com/thepowersgang/mrustc/issues/78>.
|
2024-01-25 06:29:20 +00:00
|
|
|
;; List of systems where rust-bootstrap is explicitly known to build:
|
|
|
|
(supported-systems '("x86_64-linux" "aarch64-linux"
|
|
|
|
"riscv64-linux" "powerpc64le-linux"))
|
2021-11-27 21:27:09 +00:00
|
|
|
|
2020-08-18 18:59:03 +00:00
|
|
|
;; Dual licensed.
|
|
|
|
(license (list license:asl2.0 license:expat))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.55
|
2020-08-18 18:59:03 +00:00
|
|
|
(package
|
|
|
|
(name "rust")
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(version "1.55.0")
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (rust-uri version))
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(sha256 (base32 "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(modules '((guix build utils)))
|
2022-07-10 17:07:09 +00:00
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2022-07-10 17:07:09 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
2023-02-17 08:33:05 +00:00
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
(delete-file "vendor/vte/vim10m_match")
|
|
|
|
(delete-file "vendor/vte/vim10m_table")
|
2023-03-14 11:58:34 +00:00
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
;; find vendor -not -type d -exec file {} \+ | grep PE32
|
|
|
|
(for-each delete-file
|
2024-01-12 10:52:06 +00:00
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
2022-07-10 17:07:09 +00:00
|
|
|
;; Add support for riscv64-linux.
|
|
|
|
(substitute* "vendor/tikv-jemallocator/src/lib.rs"
|
|
|
|
((" target_arch = \"s390x\"," all)
|
|
|
|
(string-append all "\n target_arch = \"riscv64\",")))))))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(outputs '("out" "cargo"))
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(properties '((hidden? . #t)
|
|
|
|
(timeout . 72000) ;20 hours
|
2020-08-18 18:59:03 +00:00
|
|
|
(max-silent-time . 18000))) ;5 hours (for armel)
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
`(#:validate-runpath? #f
|
|
|
|
;; Only the final Rust is tested, not the intermediate bootstrap ones,
|
|
|
|
;; for performance and simplicity.
|
|
|
|
#:tests? #f
|
2020-08-18 18:59:03 +00:00
|
|
|
#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
#:modules ((guix build cargo-utils)
|
|
|
|
(guix build utils)
|
2020-08-18 18:59:03 +00:00
|
|
|
(guix build gnu-build-system)
|
|
|
|
(ice-9 match)
|
|
|
|
(srfi srfi-1))
|
|
|
|
#:phases
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
(add-after 'unpack 'set-env
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(setenv "SHELL" (which "sh"))
|
|
|
|
(setenv "CONFIG_SHELL" (which "sh"))
|
2021-07-16 14:50:56 +00:00
|
|
|
(setenv "CC" (search-input-file inputs "/bin/gcc"))
|
2020-08-18 18:59:03 +00:00
|
|
|
;; The Guix LLVM package installs only shared libraries.
|
|
|
|
(setenv "LLVM_LINK_SHARED" "1")))
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
(add-after 'unpack 'set-linker-locale-to-utf8
|
|
|
|
(lambda _
|
|
|
|
(substitute* (find-files "." "^linker.rs$")
|
|
|
|
(("linker.env\\(\"LC_ALL\", \"C\"\\);")
|
|
|
|
"linker.env(\"LC_ALL\", \"en_US.UTF-8\");"))))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(add-after 'unpack 'add-cc-shim-to-path
|
|
|
|
(lambda _
|
|
|
|
(mkdir-p "/tmp/bin")
|
|
|
|
(symlink (which "gcc") "/tmp/bin/cc")
|
|
|
|
(setenv "PATH" (string-append "/tmp/bin:" (getenv "PATH")))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(replace 'configure
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(gcc (assoc-ref inputs "gcc"))
|
|
|
|
(python (assoc-ref inputs "python"))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(binutils (assoc-ref inputs "binutils"))
|
2020-08-18 18:59:03 +00:00
|
|
|
(rustc (assoc-ref inputs "rustc-bootstrap"))
|
|
|
|
(cargo (assoc-ref inputs "cargo-bootstrap"))
|
2023-12-17 17:55:51 +00:00
|
|
|
(llvm (assoc-ref inputs "llvm")))
|
2020-08-18 18:59:03 +00:00
|
|
|
(call-with-output-file "config.toml"
|
|
|
|
(lambda (port)
|
|
|
|
(display (string-append "
|
|
|
|
[llvm]
|
|
|
|
[build]
|
|
|
|
cargo = \"" cargo "/bin/cargo" "\"
|
|
|
|
rustc = \"" rustc "/bin/rustc" "\"
|
|
|
|
docs = false
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
python = \"" python "/bin/python" "\"
|
2020-08-18 18:59:03 +00:00
|
|
|
vendor = true
|
|
|
|
submodules = false
|
|
|
|
[install]
|
|
|
|
prefix = \"" out "\"
|
|
|
|
sysconfdir = \"etc\"
|
|
|
|
[rust]
|
2022-10-20 06:25:31 +00:00
|
|
|
debug=false
|
2023-12-17 17:55:51 +00:00
|
|
|
jemalloc=false
|
2020-08-18 18:59:03 +00:00
|
|
|
default-linker = \"" gcc "/bin/gcc" "\"
|
|
|
|
channel = \"stable\"
|
|
|
|
rpath = true
|
2023-12-17 15:09:31 +00:00
|
|
|
[target." ,(platform-rust-target (lookup-platform-by-system (%current-system))) "]
|
2020-08-18 18:59:03 +00:00
|
|
|
llvm-config = \"" llvm "/bin/llvm-config" "\"
|
|
|
|
cc = \"" gcc "/bin/gcc" "\"
|
|
|
|
cxx = \"" gcc "/bin/g++" "\"
|
|
|
|
ar = \"" binutils "/bin/ar" "\"
|
|
|
|
[dist]
|
|
|
|
") port))))))
|
|
|
|
(replace 'build
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
;; The standard library source location moved in this release.
|
2020-08-18 18:59:03 +00:00
|
|
|
(lambda* (#:key parallel-build? #:allow-other-keys)
|
|
|
|
(let ((job-spec (string-append
|
|
|
|
"-j" (if parallel-build?
|
|
|
|
(number->string (parallel-job-count))
|
|
|
|
"1"))))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(invoke "./x.py" job-spec "build" "--stage=1"
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
"library/std"
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
"src/tools/cargo"))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(replace 'install
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(cargo-out (assoc-ref outputs "cargo"))
|
2023-12-17 15:09:31 +00:00
|
|
|
(build (string-append "build/"
|
|
|
|
,(platform-rust-target
|
|
|
|
(lookup-platform-by-target-or-system
|
|
|
|
(or (%current-target-system)
|
|
|
|
(%current-system)))))))
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
;; Manually do the installation instead of calling './x.py
|
|
|
|
;; install', as that is slow and needlessly rebuilds some
|
|
|
|
;; things.
|
|
|
|
(install-file (string-append build "/stage1/bin/rustc")
|
|
|
|
(string-append out "/bin"))
|
|
|
|
(copy-recursively (string-append build "/stage1/lib")
|
|
|
|
(string-append out "/lib"))
|
|
|
|
(install-file (string-append build "/stage1-tools-bin/cargo")
|
|
|
|
(string-append cargo-out "/bin")))))
|
2020-08-18 18:59:03 +00:00
|
|
|
(add-after 'install 'delete-install-logs
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(for-each (lambda (f)
|
|
|
|
(false-if-exception (delete-file f)))
|
|
|
|
(append-map (lambda (output)
|
|
|
|
(find-files (string-append
|
|
|
|
output "/lib/rustlib")
|
|
|
|
"(^install.log$|^manifest-)"))
|
|
|
|
(map cdr outputs)))))
|
|
|
|
(add-after 'install 'wrap-rustc
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let ((out (assoc-ref outputs "out"))
|
|
|
|
(libc (assoc-ref inputs "libc"))
|
|
|
|
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
|
|
|
|
;; Let gcc find ld and libc startup files.
|
|
|
|
(wrap-program (string-append out "/bin/rustc")
|
|
|
|
`("PATH" ":" prefix (,(string-append ld-wrapper "/bin")))
|
|
|
|
`("LIBRARY_PATH" ":"
|
|
|
|
suffix (,(string-append libc "/lib"))))))))))
|
|
|
|
(native-inputs
|
2024-01-10 06:38:40 +00:00
|
|
|
`(("pkg-config" ,pkg-config)
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
("python" ,python-wrapper)
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
("rustc-bootstrap" ,rust-bootstrap)
|
2024-01-10 06:38:40 +00:00
|
|
|
("cargo-bootstrap" ,rust-bootstrap "cargo")))
|
2020-08-18 18:59:03 +00:00
|
|
|
(inputs
|
2023-12-17 17:55:51 +00:00
|
|
|
`(("llvm" ,llvm-13)
|
2024-01-10 06:38:40 +00:00
|
|
|
("openssl" ,openssl)))
|
2020-08-18 18:59:03 +00:00
|
|
|
;; rustc invokes gcc, so we need to set its search paths accordingly.
|
|
|
|
(native-search-paths
|
2024-01-12 10:55:51 +00:00
|
|
|
%gcc-search-paths)
|
2024-01-25 06:28:31 +00:00
|
|
|
;; Limit this to systems where the final rust compiler builds successfully.
|
|
|
|
(supported-systems '("x86_64-linux" "aarch64-linux" "riscv64-linux"))
|
2022-01-09 00:08:54 +00:00
|
|
|
(synopsis "Compiler for the Rust programming language")
|
2020-08-18 18:59:03 +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))))
|
2020-03-08 13:09:36 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.56
|
2021-01-31 21:49:25 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package
|
gnu: rust: Bootstrap with rust-1.54.0.
* gnu/packages/rust.scm (rust-1.39): Rename to rust-bootstrap. Update to
1.54.0.
[source]: Update snippet to new version. Replace mrustc patch for 1.39.0
with patch for 1.54.0.
[inputs]: Remove libssh2. Replace llvm-9 with llvm. Add gcc-9.
[arguments]: Adjust custom 'setup-mrustc-sources to also create file
with rust version. Adjust custom 'patch-makefiles phase to changes in
mrustc's build steps. Adjust custom 'build phase to follow mrustc's
build steps for rust-1.54.
(rust-1.40): Replace post-bootstrapped rust-1.40 with 1.55.
[arguments]: Add custom 'set-linker-locale-to-utf8 phase. Adjust custom
'build phase. Remove custom 'neuter-tidy phase.
[inputs]: Replace llvm-9 with llvm.
(rust-1.41, rust-1.42, rust-1.43, rust-1.44, rust-1.45, rust-1.46,
rust-1.47, rust-1.48, rust-1.49, rust-1.50, rust-1.51, rust-1.52,
rust-1.53): Remove variables.
* gnu/packages/patches/rust-1.39.0-src.patch: Remove file.
* gnu/packages/patches/rust-1.54.0-src.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register changes.
2022-07-05 07:26:03 +00:00
|
|
|
rust-1.55 "1.56.1"
|
|
|
|
"04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3")))
|
2020-03-08 22:32:35 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
2024-01-12 10:54:02 +00:00
|
|
|
(substitute-keyword-arguments
|
|
|
|
(strip-keyword-arguments '(#:validate-runpath?)
|
|
|
|
(package-arguments base-rust))
|
2020-03-08 22:32:35 +00:00
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
gnu: rust: Bootstrap rust from 1.39.0 and optimize build time.
Only stage 1 (rather than stage 2) rustc and cargo are built and the
installation phase rewritten to not invoke the build tool, which helps to
shorten the build time to about 10 minutes per Rust on a fast machine. The
total build time should take less than 4h30, down from the current 8 hours on
a Ryzen 3900X CPU.
* gnu/packages/patches/rust-reproducible-builds.patch: Delete file.
* gnu/packages/patches/rustc-1.39.0-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it, and un-register
rust-reproducible-builds.patch.
* gnu/packages/rust.scm (%mrustc-commit): New variable.
(%mrustc-source): Update to latest commit.
(rust-1.29): Morph into...
(rust-1.39): ... this.
[source]: Adjust the snippet, patches and patch-flags fields.
[inputs]: Replace llvm-7 by llvm (9).
[make-flags]: Add the RUSTC_VERSION, MRUSTC_TARGET_VER and OUTDIR_SUF make
variables. Remove the RUSTCSRC make variable.
[phases]{copy-mrustc-and-patch}: Rename to...
{setup-mrustc-sources}: ... this. A symbolic link is created inside the
mrustc directory, pointing to the Rust 1.39.0 sources.
{patch-makefiles}: Adjust directory. Patch date and git definitions. Edit
out the RUSTC_SRC_DL prerequisite. Adjust the patching of a shebang.
{patch-cargo-checksums}: Adjust.
{configure-cargo-home}: New phase.
{configure}: Create and add a 'cc' shim to PATH.
{build}: Do not invoke make in parallel mode inside the run_rustc directory.
(rust-1.30): Morph into...
(rust-1.40): ... this, integrating the changes introduced between 1.30 and
1.40.
[modules]: Properly import (guix build cargo-utils).
[phases]{add-cc-shim-to-path}: New phase.
{configure}: Increase the codegen-units value to 256.
{build}: Only build stage 1 rustc and cargo, and group the commands into one
invocation.
{install}: Manually install the stage 1 build artifacts.
{patch-cargo-checksums}: Remove the ad-hoc use-modules, no longer needed.
[source]: Adjust.
[arguments]: Set validate-runpath? to #f.
[phases]{patch-cargo-checksums}: Remove phase.
{configure}: Repatriate the jemalloc configuration changes from 1.40.
[native-inputs]: Replace the rust-1.29 inputs by rust-1.39. Use regular
jemalloc and llvm versions.
(rust-1.41)[phases]: Add the patch-cargo-checksums phase.
(rust-1.31, rust-1.32, rust-1.33, rust-1.34, rust-1.35, rust-1.36, rust-1.37)
(rust-1.38, rust-1.39, rust-1.40): Delete variables.
(rust-1.46)[phases]{install}: Group build, test and install commands.
(rust-1.47)[phases]{build}: Override to adjust for the relocation of the
standard library source directory.
2021-08-21 05:01:23 +00:00
|
|
|
(delete 'add-cc-shim-to-path)
|
|
|
|
(add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
|
2024-01-12 10:54:02 +00:00
|
|
|
(lambda _
|
2020-03-08 22:32:35 +00:00
|
|
|
(substitute* "Cargo.lock"
|
|
|
|
(("(checksum = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
2021-01-31 21:49:25 +00:00
|
|
|
(generate-all-checksums "vendor"))))))))))
|
2020-03-08 22:32:35 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.57
|
2022-08-04 01:47:17 +00:00
|
|
|
(rust-bootstrapped-package
|
2022-08-04 01:47:19 +00:00
|
|
|
;; Verified that it *doesn't* build with 1.55. e.g.:
|
|
|
|
;; * feature `edition2021` is required
|
2022-08-04 01:47:17 +00:00
|
|
|
rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.58
|
2022-08-04 01:47:19 +00:00
|
|
|
(rust-bootstrapped-package
|
|
|
|
;; Verified that it *doesn't* build with 1.56. e.g.:
|
|
|
|
;; * error: attributes starting with `rustc` are reserved for use by the
|
|
|
|
;; `rustc` compiler
|
|
|
|
;; * error: cannot find attribute `rustc_do_not_const_check` in this scope
|
|
|
|
;; * error[E0522]: definition of an unknown language item:
|
|
|
|
;; `const_eval_select_ct`
|
|
|
|
rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.59
|
2022-09-13 08:21:18 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
;; Verified that it *doesn't* build with 1.57. e.g.:
|
|
|
|
;; * error: `doc(primitive)` should never have been stable
|
|
|
|
;; * error[E0522]: definition of an unknown language item:
|
|
|
|
;; `generator_return`
|
|
|
|
;; * error[E0206]: the trait `Copy` may not be implemented for this type
|
|
|
|
rust-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(if (target-riscv64?)
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'unpack 'revert-riscv-pause-instruction
|
|
|
|
(lambda _
|
|
|
|
;; This fails with:
|
|
|
|
;; error: unknown directive, referring to '.insn'.
|
|
|
|
;; This is due to building with llvm < 14.
|
|
|
|
;; https://github.com/rust-lang/stdarch/issues/1291
|
|
|
|
;; Partial roll-back from this commit:
|
|
|
|
;; https://github.com/rust-lang/stdarch/pull/1271
|
|
|
|
(substitute*
|
|
|
|
"library/stdarch/crates/core_arch/src/riscv_shared/mod.rs"
|
|
|
|
(("\\.insn i 0x0F, 0, x0, x0, 0x010") ".word 0x0100000F")))))))
|
|
|
|
(package-arguments base-rust))))))
|
2022-08-04 01:47:19 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.60
|
2022-08-04 01:47:19 +00:00
|
|
|
(rust-bootstrapped-package
|
|
|
|
;; Verified that it *doesn't* build with 1.58. e.g.:
|
|
|
|
;; * error: unknown codegen option: `symbol-mangling-version`
|
|
|
|
rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.61
|
2023-03-14 11:59:20 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2023-03-14 11:59:20 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
(delete-file "vendor/vte/vim10m_match")
|
|
|
|
(delete-file "vendor/vte/vim10m_table")
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
2024-01-12 10:52:06 +00:00
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
|
2022-10-21 07:59:21 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.62
|
2022-11-15 16:09:44 +00:00
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.61 "1.62.1" "0gqkg34ic77dcvsz69qbdng6g3zfhl6hnhx7ha1mjkyrzipvxb3j"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.63
|
2022-11-15 16:10:25 +00:00
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.64
|
2022-11-15 14:28:13 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2022-11-29 13:08:16 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2024-01-16 18:45:57 +00:00
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; ERROR: could not find native static library
|
|
|
|
;; `rustix_outline_powerpc64`, perhaps an -L flag is missing?
|
|
|
|
;; Adjust rustix to always build with cc.
|
|
|
|
(substitute* "src/bootstrap/Cargo.lock"
|
|
|
|
(("\"errno\",") "\"cc\",\n \"errno\","))
|
|
|
|
;; Add a dependency on the the 'cc' feature of rustix.
|
|
|
|
(substitute* "vendor/fd-lock/Cargo.toml"
|
|
|
|
(("\"fs\"") "\"fs\", \"cc\""))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
(delete-file "vendor/vte/vim10m_match")
|
|
|
|
(delete-file "vendor/vte/vim10m_table")
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
|
2022-11-29 13:08:16 +00:00
|
|
|
(patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch"))
|
|
|
|
(patch-flags '("-p1" "--reverse"))))
|
2022-11-15 14:28:13 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(replace 'patch-cargo-checksums
|
2023-02-20 15:48:11 +00:00
|
|
|
(lambda _
|
2022-11-15 14:28:13 +00:00
|
|
|
(substitute* '("Cargo.lock"
|
2023-02-20 15:48:11 +00:00
|
|
|
"src/bootstrap/Cargo.lock"
|
|
|
|
"src/tools/rust-analyzer/Cargo.lock")
|
2022-11-15 14:28:13 +00:00
|
|
|
(("(checksum = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
|
|
|
(generate-all-checksums "vendor"))))))))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.65
|
2022-11-29 13:08:16 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(patches '())
|
|
|
|
(patch-flags '("-p1")))))))
|
2022-11-15 16:12:11 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.66
|
2023-02-19 10:43:06 +00:00
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.65 "1.66.1" "1fjr94gsicsxd2ypz4zm8aad1zdbiccr7qjfbmq8f8f7jhx96g2v"))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.67
|
2023-02-22 17:27:56 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2024-01-16 18:46:55 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Adjust rustix to always build with cc.
|
|
|
|
(substitute* '("Cargo.lock"
|
|
|
|
"src/bootstrap/Cargo.lock")
|
|
|
|
(("\"errno\",") "\"cc\",\n \"errno\","))
|
|
|
|
;; Add a dependency on the the 'cc' feature of rustix.
|
|
|
|
(substitute* "vendor/fd-lock/Cargo.toml"
|
|
|
|
(("\"fs\"") "\"fs\", \"cc\""))
|
|
|
|
(substitute* "vendor/is-terminal/Cargo.toml"
|
|
|
|
(("\"termios\"") "\"termios\", \"cc\""))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
(delete-file "vendor/vte/vim10m_match")
|
|
|
|
(delete-file "vendor/vte/vim10m_table")
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))
|
2023-02-22 17:27:56 +00:00
|
|
|
(inputs (modify-inputs (package-inputs base-rust)
|
|
|
|
(replace "llvm" llvm-15))))))
|
2023-02-19 10:43:29 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.68
|
2023-03-15 12:42:19 +00:00
|
|
|
(rust-bootstrapped-package
|
2023-04-03 19:36:54 +00:00
|
|
|
rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk"))
|
2023-03-15 12:42:19 +00:00
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.69
|
2023-07-24 05:36:30 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.68 "1.69.0"
|
|
|
|
"03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5dcwc9f1gv")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2023-07-24 05:36:30 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
2024-01-16 18:48:05 +00:00
|
|
|
;; Adjust rustix to always build with cc.
|
|
|
|
(substitute* '("Cargo.lock"
|
|
|
|
"src/bootstrap/Cargo.lock")
|
|
|
|
(("\"errno\",") "\"cc\",\n \"errno\","))
|
|
|
|
;; Add a dependency on the the 'cc' feature of rustix.
|
|
|
|
(substitute* "vendor/fd-lock/Cargo.toml"
|
|
|
|
(("\"fs\"") "\"fs\", \"cc\""))
|
|
|
|
(substitute* "vendor/is-terminal/Cargo.toml"
|
|
|
|
(("\"termios\"") "\"termios\", \"cc\""))
|
2023-07-24 05:36:30 +00:00
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.70
|
2023-09-18 12:19:49 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.69 "1.70.0"
|
|
|
|
"0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s1c0axgxj")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
2024-01-16 18:48:31 +00:00
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Adjust rustix to always build with cc.
|
|
|
|
(substitute* "Cargo.lock"
|
|
|
|
(("\"errno\",") "\"cc\",\n \"errno\","))
|
|
|
|
;; Add a dependency on the the 'cc' feature of rustix.
|
|
|
|
(substitute* '("vendor/is-terminal/Cargo.toml"
|
|
|
|
"vendor/is-terminal-0.4.4/Cargo.toml")
|
|
|
|
(("\"termios\"") "\"termios\", \"cc\""))
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
|
2023-09-18 12:19:49 +00:00
|
|
|
;; Rust 1.70 adds the rustix library which depends on the vendored
|
|
|
|
;; fd-lock crate. The fd-lock crate uses Outline assembly which expects
|
|
|
|
;; a precompiled static library. Enabling the "cc" feature tells the
|
|
|
|
;; build.rs script to compile the assembly files instead of searching
|
|
|
|
;; for a precompiled library.
|
|
|
|
(patches (search-patches "rust-1.70-fix-rustix-build.patch")))))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.71
|
2023-10-14 20:41:41 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2024-01-16 18:48:51 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Adjust rustix to always build with cc.
|
|
|
|
(substitute* '("Cargo.lock"
|
|
|
|
"src/tools/cargo/Cargo.lock")
|
|
|
|
(("\"errno\",") "\"cc\",\n \"errno\","))
|
|
|
|
;; Add a dependency on the the 'cc' feature of rustix.
|
|
|
|
(substitute* '("vendor/is-terminal/Cargo.toml"
|
|
|
|
"vendor/is-terminal-0.4.6/Cargo.toml")
|
|
|
|
(("\"termios\"") "\"termios\", \"cc\""))
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))
|
2023-10-14 20:41:41 +00:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(replace 'patch-cargo-checksums
|
|
|
|
(lambda _
|
|
|
|
(substitute* (cons* "Cargo.lock"
|
|
|
|
"src/bootstrap/Cargo.lock"
|
|
|
|
(find-files "src/tools" "Cargo.lock"))
|
|
|
|
(("(checksum = )\".*\"" all name)
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
|
|
|
(generate-all-checksums "vendor"))))))))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.72
|
2023-10-14 21:09:33 +00:00
|
|
|
(let ((base-rust
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.71 "1.72.1" "15gqd1jzhnc16a7gjmav4x1v83jjbzyjh1gvcdfvpkajd9gq8j3z")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2023-10-14 21:09:33 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
2024-01-16 18:49:15 +00:00
|
|
|
;; Adjust some crates to explicitly use rustix with the libc backend.
|
|
|
|
(substitute* '("vendor/is-terminal/Cargo.toml"
|
|
|
|
"vendor/is-terminal-0.4.7/Cargo.toml")
|
|
|
|
(("\"termios\"") "\"termios\", \"use-libc\""))
|
2023-10-14 21:09:33 +00:00
|
|
|
(substitute* "compiler/rustc_driver/Cargo.toml"
|
|
|
|
(("rustix = \"=0.37.11\"")
|
|
|
|
(string-append "rustix = { version = \"=0.37.11\","
|
|
|
|
" features = [\"use-libc\"] }"))))))))))
|
|
|
|
|
gnu: Make intermediate packages public but hidden.
This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).
* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.
Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
2024-01-10 21:47:35 +00:00
|
|
|
(define-public rust-1.73
|
2023-10-15 15:33:24 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.72 "1.73.0"
|
|
|
|
"0fmvn7vg3qg9xprgfwv10g3ygy8i4j4bkcxcr1xdy89d3xnjxmln")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2023-10-15 15:33:24 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
|
|
|
;; Adjust vendored dependency to explicitly use rustix with libc backend.
|
|
|
|
(substitute* "vendor/tempfile-3.6.0/Cargo.toml"
|
|
|
|
(("features = \\[\"fs\"" all)
|
|
|
|
(string-append all ", \"use-libc\""))))))))))
|
|
|
|
|
2024-03-11 09:31:18 +00:00
|
|
|
(define-public rust-1.74
|
2023-12-17 10:59:13 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.73 "1.74.1"
|
|
|
|
"07930r17dkj3dnsrmilywb6p9i2g2jx56ndfpa2wh8crzhi3xnv7")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-01-12 10:52:06 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
2023-12-17 10:59:13 +00:00
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
|
|
|
;; Adjust vendored dependency to explicitly use rustix with libc backend.
|
|
|
|
(substitute* "vendor/tempfile/Cargo.toml"
|
|
|
|
(("features = \\[\"fs\"" all)
|
2024-01-23 12:01:45 +00:00
|
|
|
(string-append all ", \"use-libc\"")))))))
|
|
|
|
(arguments
|
|
|
|
(if (target-riscv64?)
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
;; This phase is no longer needed.
|
|
|
|
(delete 'revert-riscv-pause-instruction))))
|
|
|
|
(package-arguments base-rust))))))
|
2023-12-17 10:59:13 +00:00
|
|
|
|
2024-03-11 09:31:18 +00:00
|
|
|
(define-public rust-1.75
|
2024-01-02 07:44:24 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0"
|
|
|
|
"1260mf3066ki6y55pvr35lnf54am6z96a3ap3hniwd4xpi2rywsv")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(patches '()))))))
|
|
|
|
|
2024-02-26 15:37:31 +00:00
|
|
|
(define-public rust-1.76
|
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.75 "1.76.0"
|
|
|
|
"08f06shp6l72qrv5fwg1is7yzr6kwj8av0l9h5k243bz781zyp4y")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
;; Need llvm >= 16.0
|
|
|
|
(inputs (modify-inputs (package-inputs base-rust)
|
|
|
|
(replace "llvm" llvm-17))))))
|
|
|
|
|
2024-03-24 14:27:38 +00:00
|
|
|
(define-public rust-1.77
|
2024-04-02 06:56:57 +00:00
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.1"
|
|
|
|
"18d4ncdzp0nfimmw029xdf7vv1hgh82v30mjnnixnllzar66w47f")))
|
2024-03-24 14:27:38 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'configure 'no-optimized-compiler-builtins
|
|
|
|
(lambda _
|
|
|
|
;; Pre-1.77, the behavior was equivalent to this flag being
|
|
|
|
;; "false" if the llvm-project submodule wasn't checked out.
|
|
|
|
;;
|
|
|
|
;; Now there's an explicit check, so the build fails if we don't
|
|
|
|
;; manually disable this (given that we don't have the submodule checked out).
|
|
|
|
;; Thus making the build behave the same as it did in 1.76 and earlier.
|
|
|
|
;;
|
|
|
|
;; TODO - make the build system depend on system llvm for this, so we
|
|
|
|
;; can get the performance benefits of setting this to true?
|
|
|
|
(substitute* "config.toml"
|
|
|
|
(("\\[build\\]")
|
|
|
|
"[build]\noptimized-compiler-builtins = false")))))))))))
|
|
|
|
|
2024-06-26 09:27:44 +00:00
|
|
|
(define-public rust-1.78
|
|
|
|
(rust-bootstrapped-package
|
|
|
|
rust-1.77 "1.78.0" "1afmj5g3bz7439w4i8zjhd68zvh0gqg7ymr8h5rz49ybllilhm7z"))
|
|
|
|
|
2024-06-26 09:27:50 +00:00
|
|
|
(define-public rust-1.79
|
|
|
|
(let ((base-rust (rust-bootstrapped-package rust-1.78 "1.79.0"
|
|
|
|
"1h282jb1yxc69999w4nhvqb08rw2jy32i9njdjqrz78zglycybhp")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
|
|
|
"vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
|
|
|
|
"vendor/openssl-src-111.28.1+1.1.1w/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
|
|
|
;; Adjust vendored dependency to explicitly use rustix with libc backend.
|
|
|
|
(substitute* '("vendor/tempfile-3.7.1/Cargo.toml"
|
|
|
|
"vendor/tempfile-3.10.1/Cargo.toml")
|
|
|
|
(("features = \\[\"fs\"" all)
|
|
|
|
(string-append all ", \"use-libc\""))))))))))
|
|
|
|
|
2023-07-24 05:36:47 +00:00
|
|
|
(define (make-ignore-test-list strs)
|
|
|
|
"Function to make creating a list to ignore tests a bit easier."
|
|
|
|
(map (lambda (str)
|
|
|
|
`((,str) (string-append "#[ignore]\n" ,str)))
|
|
|
|
strs))
|
|
|
|
|
2023-05-11 13:35:53 +00:00
|
|
|
;;; Note: Only the latest version of Rust is supported and tested. The
|
2022-08-04 01:47:17 +00:00
|
|
|
;;; intermediate rusts are built for bootstrapping purposes and should not
|
|
|
|
;;; be relied upon. This is to ease maintenance and reduce the time
|
|
|
|
;;; required to build the full Rust bootstrap chain.
|
|
|
|
;;;
|
|
|
|
;;; Here we take the latest included Rust, make it public, and re-enable tests
|
|
|
|
;;; and extra components such as rustfmt.
|
|
|
|
(define-public rust
|
2024-03-24 14:27:38 +00:00
|
|
|
(let ((base-rust rust-1.77))
|
2021-12-28 05:15:01 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
2024-03-06 11:06:08 +00:00
|
|
|
(properties (append
|
|
|
|
(alist-delete 'hidden? (package-properties base-rust))
|
2024-02-26 15:37:32 +00:00
|
|
|
(clang-compiler-cpu-architectures "17")))
|
2023-10-01 16:48:59 +00:00
|
|
|
(outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
|
2024-01-12 10:57:30 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(inherit (package-source base-rust))
|
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
(for-each delete-file-recursively
|
|
|
|
'("src/llvm-project"
|
2024-02-26 15:37:32 +00:00
|
|
|
"vendor/jemalloc-sys/jemalloc"
|
2024-01-12 10:57:30 +00:00
|
|
|
"vendor/openssl-src/openssl"
|
|
|
|
"vendor/tikv-jemalloc-sys/jemalloc"
|
|
|
|
;; These are referenced by the cargo output
|
|
|
|
;; so we unbundle them.
|
|
|
|
"vendor/curl-sys/curl"
|
|
|
|
"vendor/curl-sys-0.4.63+curl-8.1.2/curl"
|
|
|
|
"vendor/libffi-sys/libffi"
|
|
|
|
"vendor/libnghttp2-sys/nghttp2"
|
2024-03-24 14:27:38 +00:00
|
|
|
"vendor/libz-sys/src/zlib"
|
|
|
|
"vendor/libz-sys-1.1.9/src/zlib"))
|
2024-01-12 10:57:30 +00:00
|
|
|
;; Use the packaged nghttp2
|
|
|
|
(delete-file "vendor/libnghttp2-sys/build.rs")
|
|
|
|
(with-output-to-file "vendor/libnghttp2-sys/build.rs"
|
|
|
|
(lambda _
|
|
|
|
(format #t "fn main() {~@
|
|
|
|
println!(\"cargo:rustc-link-lib=nghttp2\");~@
|
|
|
|
}~%")))
|
|
|
|
;; Remove vendored dynamically linked libraries.
|
|
|
|
;; find . -not -type d -executable -exec file {} \+ | grep ELF
|
|
|
|
;; Also remove the bundled (mostly Windows) libraries.
|
|
|
|
(for-each delete-file
|
|
|
|
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
|
|
|
;; Adjust vendored dependency to explicitly use rustix with libc backend.
|
|
|
|
(substitute* "vendor/tempfile/Cargo.toml"
|
|
|
|
(("features = \\[\"fs\"" all)
|
|
|
|
(string-append all ", \"use-libc\"")))))))
|
2020-12-07 22:47:39 +00:00
|
|
|
(arguments
|
2023-12-17 10:59:13 +00:00
|
|
|
(substitute-keyword-arguments
|
|
|
|
(strip-keyword-arguments '(#:tests?)
|
|
|
|
(package-arguments base-rust))
|
2020-12-07 22:47:39 +00:00
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'unpack 'relax-gdb-auto-load-safe-path
|
|
|
|
;; Allow GDB to load binaries from any location, otherwise the
|
|
|
|
;; gdbinfo tests fail. This is only useful when testing with a
|
|
|
|
;; GDB version newer than 8.2.
|
|
|
|
(lambda _
|
|
|
|
(setenv "HOME" (getcwd))
|
|
|
|
(with-output-to-file (string-append (getenv "HOME") "/.gdbinit")
|
|
|
|
(lambda _
|
|
|
|
(format #t "set auto-load safe-path /~%")))
|
|
|
|
;; Do not launch gdb with '-nx' which causes it to not execute
|
|
|
|
;; any init file.
|
|
|
|
(substitute* "src/tools/compiletest/src/runtest.rs"
|
|
|
|
(("\"-nx\".as_ref\\(\\), ")
|
|
|
|
""))))
|
|
|
|
(add-after 'unpack 'disable-tests-requiring-git
|
|
|
|
(lambda _
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* "src/tools/cargo/tests/testsuite/git.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn fetch_downloads_with_git2_first_")))))
|
2023-02-20 15:48:11 +00:00
|
|
|
(add-after 'unpack 'disable-tests-requiring-mercurial
|
|
|
|
(lambda _
|
2023-10-23 07:42:13 +00:00
|
|
|
(with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init"
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* '("mercurial_autodetect/mod.rs"
|
|
|
|
"simple_hg_ignore_exists/mod.rs")
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn case"))))))
|
2023-10-23 07:42:13 +00:00
|
|
|
(add-after 'unpack 'disable-tests-using-cargo-publish
|
|
|
|
(lambda _
|
|
|
|
(with-directory-excursion "src/tools/cargo/tests/testsuite"
|
|
|
|
(substitute* "alt_registry.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn warn_for_unused_fields")))
|
|
|
|
(substitute* '("cargo_add/locked_unchanged/mod.rs"
|
|
|
|
"cargo_add/lockfile_updated/mod.rs"
|
|
|
|
"cargo_remove/update_lock_file/mod.rs")
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn case")))
|
|
|
|
(substitute* "git_shallow.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn gitoxide_clones_git_dependency_with_shallow_protocol_and_git2_is_used_for_followup_fetches"
|
|
|
|
"fn gitoxide_clones_registry_with_shallow_protocol_and_aborts_and_updates_again"
|
|
|
|
"fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_shallowness"
|
|
|
|
"fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_with_git2_fetch"
|
|
|
|
"fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_shallowness"
|
|
|
|
"fn gitoxide_shallow_clone_followed_by_non_shallow_update"
|
|
|
|
"fn gitoxide_clones_shallow_two_revs_same_deps"
|
|
|
|
"fn gitoxide_git_dependencies_switch_from_branch_to_rev"
|
|
|
|
"fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency")))
|
|
|
|
(substitute* "install.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn failed_install_retains_temp_directory")))
|
|
|
|
(substitute* "offline.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn gitoxide_cargo_compile_offline_with_cached_git_dep_shallow_dep")))
|
|
|
|
(substitute* "patch.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn gitoxide_clones_shallow_old_git_patch"))))))
|
2024-01-25 06:27:50 +00:00
|
|
|
,@(if (target-riscv64?)
|
|
|
|
;; Keep this phase separate so it can be adjusted without needing
|
|
|
|
;; to adjust the skipped tests on other architectures.
|
|
|
|
`((add-after 'unpack 'disable-tests-broken-on-riscv64
|
|
|
|
(lambda _
|
|
|
|
(with-directory-excursion "src/tools/cargo/tests/testsuite"
|
|
|
|
(substitute* "build.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn uplift_dwp_of_bin_on_linux")))
|
|
|
|
(substitute* "cache_lock.rs"
|
|
|
|
,@(make-ignore-test-list
|
2024-04-02 06:56:57 +00:00
|
|
|
'("fn multiple_shared"
|
|
|
|
"fn multiple_download"
|
2024-03-28 06:39:55 +00:00
|
|
|
"fn download_then_mutate")))
|
|
|
|
(substitute* "global_cache_tracker.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn package_cache_lock_during_build")))))))
|
2024-01-25 06:27:50 +00:00
|
|
|
`())
|
2023-04-12 11:45:48 +00:00
|
|
|
(add-after 'unpack 'disable-tests-broken-on-aarch64
|
|
|
|
(lambda _
|
|
|
|
(with-directory-excursion "src/tools/cargo/tests/testsuite/"
|
|
|
|
(substitute* "build_script_extra_link_arg.rs"
|
2023-09-30 20:43:47 +00:00
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn build_script_extra_link_arg_bin_single")))
|
2023-04-12 11:45:48 +00:00
|
|
|
(substitute* "build_script.rs"
|
2023-09-30 20:43:47 +00:00
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn env_test")))
|
2023-04-12 11:45:48 +00:00
|
|
|
(substitute* "collisions.rs"
|
2023-09-30 20:43:47 +00:00
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn collision_doc_profile_split")))
|
2023-04-12 11:45:48 +00:00
|
|
|
(substitute* "concurrent.rs"
|
2023-09-30 20:43:47 +00:00
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn no_deadlock_with_git_dependencies")))
|
2023-04-12 11:45:48 +00:00
|
|
|
(substitute* "features2.rs"
|
2023-09-30 20:43:47 +00:00
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn dep_with_optional_host_deps_activated"))))))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'unpack 'patch-command-exec-tests
|
|
|
|
;; This test suite includes some tests that the stdlib's
|
|
|
|
;; `Command` execution properly handles in situations where
|
|
|
|
;; the environment or PATH variable are empty, but this fails
|
|
|
|
;; since we don't have `echo` available at its usual FHS
|
|
|
|
;; location.
|
|
|
|
(lambda _
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* "tests/ui/command/command-exec.rs"
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(("Command::new\\(\"echo\"\\)")
|
|
|
|
(format #f "Command::new(~s)" (which "echo"))))))
|
|
|
|
(add-after 'unpack 'patch-command-uid-gid-test
|
|
|
|
(lambda _
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* "tests/ui/command/command-uid-gid.rs"
|
|
|
|
(("/bin/sh") (which "sh"))
|
|
|
|
(("/bin/ls") (which "ls")))))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'unpack 'skip-shebang-tests
|
|
|
|
;; This test make sure that the parser behaves properly when a
|
|
|
|
;; source file starts with a shebang. Unfortunately, the
|
|
|
|
;; patch-shebangs phase changes the meaning of these edge-cases.
|
|
|
|
;; We skip the test since it's drastically unlikely Guix's
|
|
|
|
;; packaging will introduce a bug here.
|
|
|
|
(lambda _
|
2023-05-11 13:35:53 +00:00
|
|
|
(delete-file "tests/ui/parser/shebang/sneaky-attrib.rs")))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'unpack 'patch-process-tests
|
2020-12-07 22:47:39 +00:00
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(let ((bash (assoc-ref inputs "bash")))
|
2023-09-30 20:43:47 +00:00
|
|
|
(with-directory-excursion "library/std/src"
|
|
|
|
(substitute* "process/tests.rs"
|
|
|
|
(("\"/bin/sh\"")
|
|
|
|
(string-append "\"" bash "/bin/sh\"")))
|
|
|
|
;; The three tests which are known to fail upstream on QEMU
|
|
|
|
;; emulation on aarch64 and riscv64 also fail on x86_64 in
|
|
|
|
;; Guix's build system. Skip them on all builds.
|
2024-03-24 14:27:38 +00:00
|
|
|
(substitute* "sys/pal/unix/process/process_common/tests.rs"
|
2023-10-03 07:22:58 +00:00
|
|
|
;; We can't use make-ignore-test-list because we will get
|
|
|
|
;; build errors due to the double [ignore] block.
|
|
|
|
(("target_arch = \"arm\"" arm)
|
|
|
|
(string-append "target_os = \"linux\",\n"
|
|
|
|
" " arm)))))))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'unpack 'disable-interrupt-tests
|
|
|
|
(lambda _
|
|
|
|
;; This test hangs in the build container; disable it.
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* "src/tools/cargo/tests/testsuite/freshness.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn linking_interrupted")))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
;; Likewise for the ctrl_c_kills_everyone test.
|
2023-09-30 20:43:47 +00:00
|
|
|
(substitute* "src/tools/cargo/tests/testsuite/death.rs"
|
|
|
|
,@(make-ignore-test-list
|
|
|
|
'("fn ctrl_c_kills_everyone")))))
|
2023-05-11 13:35:53 +00:00
|
|
|
(add-after 'unpack 'adjust-rpath-values
|
|
|
|
;; This adds %output:out to rpath, allowing us to install utilities in
|
|
|
|
;; different outputs while reusing the shared libraries.
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(let ((out (assoc-ref outputs "out")))
|
2024-01-02 07:44:24 +00:00
|
|
|
(substitute* "src/bootstrap/src/core/builder.rs"
|
2023-05-11 13:35:53 +00:00
|
|
|
((" = rpath.*" all)
|
|
|
|
(string-append all
|
|
|
|
" "
|
|
|
|
"rustflags.arg(\"-Clink-args=-Wl,-rpath="
|
|
|
|
out "/lib\");\n"))))))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
(add-after 'configure 'add-gdb-to-config
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(let ((gdb (assoc-ref inputs "gdb")))
|
|
|
|
(substitute* "config.toml"
|
|
|
|
(("^python =.*" all)
|
|
|
|
(string-append all
|
2021-08-30 12:40:49 +00:00
|
|
|
"gdb = \"" gdb "/bin/gdb\"\n"))))))
|
|
|
|
(replace 'build
|
2023-10-01 07:49:07 +00:00
|
|
|
;; Phase overridden to also build more tools.
|
2021-08-30 12:40:49 +00:00
|
|
|
(lambda* (#:key parallel-build? #:allow-other-keys)
|
|
|
|
(let ((job-spec (string-append
|
|
|
|
"-j" (if parallel-build?
|
|
|
|
(number->string (parallel-job-count))
|
|
|
|
"1"))))
|
|
|
|
(invoke "./x.py" job-spec "build"
|
2023-10-01 07:49:07 +00:00
|
|
|
"library/std" ;rustc
|
2021-08-30 12:40:49 +00:00
|
|
|
"src/tools/cargo"
|
2023-10-01 07:49:07 +00:00
|
|
|
"src/tools/clippy"
|
|
|
|
"src/tools/rust-analyzer"
|
2021-08-30 12:40:49 +00:00
|
|
|
"src/tools/rustfmt"))))
|
|
|
|
(replace 'check
|
2023-10-01 07:49:07 +00:00
|
|
|
;; Phase overridden to also test more tools.
|
2021-08-30 12:40:49 +00:00
|
|
|
(lambda* (#:key tests? parallel-build? #:allow-other-keys)
|
|
|
|
(when tests?
|
|
|
|
(let ((job-spec (string-append
|
|
|
|
"-j" (if parallel-build?
|
|
|
|
(number->string (parallel-job-count))
|
|
|
|
"1"))))
|
|
|
|
(invoke "./x.py" job-spec "test" "-vv"
|
|
|
|
"library/std"
|
|
|
|
"src/tools/cargo"
|
2023-10-01 07:49:07 +00:00
|
|
|
"src/tools/clippy"
|
|
|
|
"src/tools/rust-analyzer"
|
2021-08-30 12:40:49 +00:00
|
|
|
"src/tools/rustfmt")))))
|
|
|
|
(replace 'install
|
2023-10-01 07:49:07 +00:00
|
|
|
;; Phase overridden to also install more tools.
|
2021-08-30 12:40:49 +00:00
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(invoke "./x.py" "install")
|
|
|
|
(substitute* "config.toml"
|
|
|
|
;; Adjust the prefix to the 'cargo' output.
|
|
|
|
(("prefix = \"[^\"]*\"")
|
|
|
|
(format #f "prefix = ~s" (assoc-ref outputs "cargo"))))
|
|
|
|
(invoke "./x.py" "install" "cargo")
|
|
|
|
(substitute* "config.toml"
|
2023-10-01 07:49:07 +00:00
|
|
|
;; Adjust the prefix to the 'tools' output.
|
2021-08-30 12:40:49 +00:00
|
|
|
(("prefix = \"[^\"]*\"")
|
2023-10-01 07:49:07 +00:00
|
|
|
(format #f "prefix = ~s" (assoc-ref outputs "tools"))))
|
|
|
|
(invoke "./x.py" "install" "clippy")
|
|
|
|
(invoke "./x.py" "install" "rust-analyzer")
|
2023-10-01 16:48:59 +00:00
|
|
|
(invoke "./x.py" "install" "rustfmt")))
|
|
|
|
(add-after 'install 'install-rust-src
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(let ((out (assoc-ref outputs "rust-src"))
|
|
|
|
(dest "/lib/rustlib/src/rust"))
|
|
|
|
(mkdir-p (string-append out dest))
|
|
|
|
(copy-recursively "library" (string-append out dest "/library"))
|
|
|
|
(copy-recursively "src" (string-append out dest "/src")))))
|
2023-12-17 14:51:49 +00:00
|
|
|
(add-after 'install 'remove-uninstall-script
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
;; This script has no use on Guix
|
|
|
|
;; and it retains a reference to the host's bash.
|
|
|
|
(delete-file (string-append (assoc-ref outputs "out")
|
|
|
|
"/lib/rustlib/uninstall.sh"))))
|
2023-10-01 16:48:59 +00:00
|
|
|
(add-after 'install-rust-src 'wrap-rust-analyzer
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
2023-11-05 06:55:31 +00:00
|
|
|
(let ((bin (string-append (assoc-ref outputs "tools") "/bin")))
|
|
|
|
(rename-file (string-append bin "/rust-analyzer")
|
|
|
|
(string-append bin "/.rust-analyzer-real"))
|
|
|
|
(call-with-output-file (string-append bin "/rust-analyzer")
|
|
|
|
(lambda (port)
|
|
|
|
(format port "#!~a
|
|
|
|
if test -z \"${RUST_SRC_PATH}\";then export RUST_SRC_PATH=~S;fi;
|
|
|
|
exec -a \"$0\" \"~a\" \"$@\""
|
|
|
|
(which "bash")
|
|
|
|
(string-append (assoc-ref outputs "rust-src")
|
|
|
|
"/lib/rustlib/src/rust/library")
|
|
|
|
(string-append bin "/.rust-analyzer-real"))))
|
|
|
|
(chmod (string-append bin "/rust-analyzer") #o755))))))))
|
2024-01-10 06:38:40 +00:00
|
|
|
(inputs
|
|
|
|
(modify-inputs (package-inputs base-rust)
|
2024-01-12 10:57:30 +00:00
|
|
|
(prepend curl libffi `(,nghttp2 "lib") zlib)))
|
gnu: rust: Only test the current release.
By only testing the final Rust in the bootstrap chain, the total build time is
reduced by approximately 30%, from about 11 hours to 8 hours on a fast
machine. Combined with commit df93fc21a4, the total Rust bootstrap chain
build time should have been halved.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/rust.scm (rust-1.29): Do not apply the above patch.
(rust-1.30): Remove the "doc" output. Disable tests.
[phases]{set-env}: Do not set CFG_DISABLE_CROSS_TESTS.
{relax-gdb-auto-load-safe-path, patch-tests, patch-cargo-index-update}
{patch-aarch64-test, remove-unsupported-tests, disable-amd64-avx-test}
{patch-cargo-tests, patch-cargo-env-shebang}
{ignore-cargo-package-tests}: Remove phases.
{configure}: Remove the doc and gdb bindings and their respective
configuration entries in the generated config.toml file.
{check}: Remove phase.
[native-inputs]{bison, flex, gdb, procps}: Remove inputs.
{python-2}: Replace by python-wrapper.
{rust-1.29}: Do not export variable.
{rust-1.30}: Likewise.
(rust-1.31): Likewise.
[arguments]: Remove field.
(rust-1.32): Do not export variable.
[source]: Remove patch.
[phases]{override-jemalloc}: Order following 'configure.
{remove-flaky-test, patch-aarch64-test}: Remove deletions.
(rust-1.33): Do not export variable.
[arguments]: Remove field.
(rust-1.34): Do not export variable.
(rust-1.35): Likewise.
(rust-1.36): Likewise.
[arguments]: Remove field.
(rust-1.37): Do not export variable.
(rust-1.38): Do not export variable.
[arguments]: Likewise.
(rust-1.39): Do not export variable.
(rust-1.40): Do not export variable.
[phases]: Do not alter the #:phases argument.
(rust-1.41, rust-1.42, rust-1.43): Do not export variables.
(rust-1.44): Likewise.
[arguments]: Remove field.
(rust-1.45): Do not export variable.
[phases]{skip-shebang-tests, skip-networking-test}: Remove phases.
(rust-1.46): Do not export variable.
(rust-1.47): Do not export variable.
[arguments]: Remove field.
(rust-1.48): Do not export variable.
[arguments]: Remove field.
(rust-1.49): Rename to...
(rust): ... this.
[outputs]: Add a "doc" output.
[phases]{enable-docs, add-gdb-to-config}
{relax-gdb-auto-load-safe-path, patch-cargo-env-shebang}
{disable-tests-requiring-git, disable-interrupt-tests}
{patch-command-exec-tests, patch-command-uid-gid-test}
{skip-shebang-tests, patch-process-tests}: New phases.
[native-inputs]{gdb-9.2, procps}: New inputs.
2021-02-01 15:34:26 +00:00
|
|
|
;; Add test inputs.
|
2023-04-18 14:08:31 +00:00
|
|
|
(native-inputs (cons* `("gdb" ,gdb/pinned)
|
2021-08-30 12:40:49 +00:00
|
|
|
`("procps" ,procps)
|
|
|
|
(package-native-inputs base-rust))))))
|
2023-10-28 13:39:33 +00:00
|
|
|
|
2023-11-20 10:21:03 +00:00
|
|
|
(define*-public (make-rust-sysroot target)
|
2024-01-05 16:40:49 +00:00
|
|
|
(make-rust-sysroot/implementation target rust))
|
|
|
|
|
|
|
|
(define make-rust-sysroot/implementation
|
|
|
|
(mlambda (target base-rust)
|
2024-07-05 12:45:13 +00:00
|
|
|
(unless (platform-rust-target (lookup-platform-by-target target))
|
|
|
|
(raise
|
|
|
|
(condition
|
|
|
|
(&package-unsupported-target-error
|
|
|
|
(package base-rust)
|
|
|
|
(target target)))))
|
|
|
|
|
2023-11-20 10:21:03 +00:00
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(name (string-append "rust-sysroot-for-" target))
|
|
|
|
(outputs '("out"))
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:tests? _ #f) #f) ; This package for cross-building.
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'unpack 'unbundle-xz
|
|
|
|
(lambda _
|
|
|
|
(delete-file-recursively "vendor/lzma-sys/xz-5.2")
|
|
|
|
;; Remove the option of using the static library.
|
|
|
|
;; This is necessary for building the sysroot.
|
|
|
|
(substitute* "vendor/lzma-sys/build.rs"
|
|
|
|
(("!want_static && ") ""))))
|
|
|
|
,@(if (target-mingw? target)
|
|
|
|
`((add-after 'set-env 'patch-for-mingw
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(setenv "LIBRARY_PATH"
|
|
|
|
(string-join
|
|
|
|
(delete
|
|
|
|
(string-append
|
|
|
|
(or (assoc-ref inputs "mingw-w64-i686-winpthreads")
|
|
|
|
(assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
|
|
|
|
"/lib")
|
|
|
|
(string-split (getenv "LIBRARY_PATH") #\:))
|
|
|
|
":"))
|
|
|
|
(setenv "CPLUS_INCLUDE_PATH"
|
|
|
|
(string-join
|
|
|
|
(delete
|
|
|
|
(string-append
|
|
|
|
(or (assoc-ref inputs "mingw-w64-i686-winpthreads")
|
|
|
|
(assoc-ref inputs "mingw-w64-x86_64-winpthreads"))
|
|
|
|
"/include")
|
|
|
|
(string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
|
|
|
|
":"))
|
|
|
|
;; When building a rust-sysroot this crate is only used for
|
|
|
|
;; the rust-installer.
|
|
|
|
(substitute* "vendor/num_cpus/src/linux.rs"
|
|
|
|
(("\\.ceil\\(\\)") ""))
|
|
|
|
;; gcc doesn't recognize this flag.
|
|
|
|
(substitute*
|
2024-01-02 07:44:24 +00:00
|
|
|
"compiler/rustc_target/src/spec/base/windows_gnullvm.rs"
|
2023-11-20 10:21:03 +00:00
|
|
|
((", \"--unwindlib=none\"") "")))))
|
|
|
|
`())
|
|
|
|
(replace 'set-env
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(setenv "SHELL" (which "sh"))
|
|
|
|
(setenv "CONFIG_SHELL" (which "sh"))
|
|
|
|
(setenv "CC" (which "gcc"))
|
|
|
|
;; The Guix LLVM package installs only shared libraries.
|
|
|
|
(setenv "LLVM_LINK_SHARED" "1")
|
|
|
|
|
|
|
|
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
|
|
|
|
(setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
|
|
|
|
(when (assoc-ref inputs (string-append "glibc-cross-" ,target))
|
|
|
|
(setenv "LIBRARY_PATH"
|
|
|
|
(string-join
|
|
|
|
(delete
|
|
|
|
(string-append
|
|
|
|
(assoc-ref inputs
|
|
|
|
(string-append "glibc-cross-" ,target))
|
|
|
|
"/lib")
|
|
|
|
(string-split (getenv "LIBRARY_PATH") #\:))
|
|
|
|
":"))
|
|
|
|
(setenv "CPLUS_INCLUDE_PATH"
|
|
|
|
(string-join
|
|
|
|
(delete
|
|
|
|
(string-append
|
|
|
|
(assoc-ref inputs
|
|
|
|
(string-append "glibc-cross-" ,target))
|
|
|
|
"/include")
|
|
|
|
(string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
|
|
|
|
":")))))
|
|
|
|
(replace 'configure
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(target-cc
|
|
|
|
(search-input-file
|
|
|
|
inputs (string-append "/bin/" ,(cc-for-target target)))))
|
|
|
|
(call-with-output-file "config.toml"
|
|
|
|
(lambda (port)
|
|
|
|
(display (string-append "
|
|
|
|
[llvm]
|
|
|
|
[build]
|
|
|
|
cargo = \"" (search-input-file inputs "/bin/cargo") "\"
|
|
|
|
rustc = \"" (search-input-file inputs "/bin/rustc") "\"
|
|
|
|
docs = false
|
|
|
|
python = \"" (which "python") "\"
|
|
|
|
vendor = true
|
|
|
|
submodules = false
|
2023-12-17 15:09:31 +00:00
|
|
|
target = [\"" ,(platform-rust-target (lookup-platform-by-target target)) "\"]
|
2023-11-20 10:21:03 +00:00
|
|
|
[install]
|
|
|
|
prefix = \"" out "\"
|
|
|
|
sysconfdir = \"etc\"
|
|
|
|
[rust]
|
|
|
|
debug = false
|
|
|
|
jemalloc = false
|
|
|
|
default-linker = \"" target-cc "\"
|
|
|
|
channel = \"stable\"
|
2023-12-17 15:09:31 +00:00
|
|
|
[target." ,(platform-rust-target (lookup-platform-by-system (%current-system))) "]
|
2023-11-20 10:21:03 +00:00
|
|
|
# These are all native tools
|
|
|
|
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
|
|
|
|
linker = \"" (which "gcc") "\"
|
|
|
|
cc = \"" (which "gcc") "\"
|
|
|
|
cxx = \"" (which "g++") "\"
|
|
|
|
ar = \"" (which "ar") "\"
|
2023-12-17 15:09:31 +00:00
|
|
|
[target." ,(platform-rust-target (lookup-platform-by-target target)) "]
|
2023-11-20 10:21:03 +00:00
|
|
|
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
|
|
|
|
linker = \"" target-cc "\"
|
|
|
|
cc = \"" target-cc "\"
|
|
|
|
cxx = \"" (search-input-file inputs (string-append "/bin/" ,(cxx-for-target target))) "\"
|
|
|
|
ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target))) "\"
|
|
|
|
[dist]
|
|
|
|
") port))))))
|
|
|
|
(replace 'build
|
|
|
|
;; Phase overridden to build the necessary directories.
|
|
|
|
(lambda* (#:key parallel-build? #:allow-other-keys)
|
|
|
|
(let ((job-spec (string-append
|
|
|
|
"-j" (if parallel-build?
|
|
|
|
(number->string (parallel-job-count))
|
|
|
|
"1"))))
|
|
|
|
;; This works for us with the --sysroot flag
|
|
|
|
;; and then we can build ONLY library/std
|
|
|
|
(invoke "./x.py" job-spec "build" "library/std"))))
|
|
|
|
(replace 'install
|
|
|
|
(lambda _
|
|
|
|
(invoke "./x.py" "install" "library/std")))
|
|
|
|
(delete 'install-rust-src)
|
|
|
|
(delete 'wrap-rust-analyzer)
|
|
|
|
(delete 'wrap-rustc)))))
|
|
|
|
(inputs
|
|
|
|
(modify-inputs (package-inputs base-rust)
|
|
|
|
(prepend xz))) ; for lzma-sys
|
|
|
|
(propagated-inputs
|
|
|
|
(if (target-mingw? target)
|
|
|
|
(modify-inputs (package-propagated-inputs base-rust)
|
|
|
|
(prepend
|
|
|
|
(if (string=? "i686-w64-mingw32" target)
|
|
|
|
mingw-w64-i686-winpthreads
|
|
|
|
mingw-w64-x86_64-winpthreads)))
|
|
|
|
(package-propagated-inputs base-rust)))
|
|
|
|
(native-inputs
|
|
|
|
(if (target-mingw? target)
|
|
|
|
(modify-inputs (package-native-inputs base-rust)
|
|
|
|
(prepend (cross-gcc target
|
|
|
|
#:libc (cross-libc target))
|
|
|
|
(cross-binutils target)
|
|
|
|
(if (string=? "i686-w64-mingw32" target)
|
|
|
|
mingw-w64-i686-winpthreads
|
2024-01-10 06:41:18 +00:00
|
|
|
mingw-w64-x86_64-winpthreads)))
|
2023-11-20 10:21:03 +00:00
|
|
|
(modify-inputs (package-native-inputs base-rust)
|
|
|
|
(prepend (cross-gcc target
|
|
|
|
#:libc (cross-libc target))
|
|
|
|
(cross-libc target)
|
|
|
|
(cross-binutils target)))))
|
|
|
|
(properties
|
|
|
|
`((hidden? . #t)
|
|
|
|
,(package-properties base-rust))))))
|
|
|
|
|
2023-10-28 13:39:33 +00:00
|
|
|
(define-public rust-analyzer
|
|
|
|
(package
|
|
|
|
(name "rust-analyzer")
|
|
|
|
(version (package-version rust))
|
|
|
|
(source #f)
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
(arguments
|
|
|
|
(list
|
|
|
|
#:modules '((guix build utils))
|
|
|
|
#:builder
|
|
|
|
#~(begin
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
(let ((rust (assoc-ref %build-inputs "rust")))
|
|
|
|
(install-file (string-append rust "/bin/rust-analyzer")
|
|
|
|
(string-append #$output "/bin"))
|
|
|
|
(copy-recursively (string-append rust "/share")
|
|
|
|
(string-append #$output "/share"))))))
|
|
|
|
(inputs
|
|
|
|
(list (list rust "tools")))
|
|
|
|
(home-page "https://rust-analyzer.github.io/")
|
|
|
|
(synopsis "Experimental Rust compiler front-end for IDEs")
|
|
|
|
(description "Rust-analyzer is a modular compiler frontend for the Rust
|
|
|
|
language. It is a part of a larger rls-2.0 effort to create excellent IDE
|
|
|
|
support for Rust.")
|
|
|
|
(license (list license:expat license:asl2.0))))
|