2016-09-22 15:04:14 +02:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2016 David Craven <david@craven.ch>
|
2016-09-28 16:24:20 +02:00
|
|
|
|
;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
Correct name and Email for ng0.
* .mailmap: Correct name and Email for ng0.
* 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/emacs.scm, gnu/packages/enlightenment.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/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.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.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-crypto.scm, gnu/packages/python-web.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: Tobias Geerinckx-Rice <me@tobias.gr>
2018-03-20 16:39:45 +01:00
|
|
|
|
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
|
2017-01-31 12:01:59 +01:00
|
|
|
|
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
2018-03-13 20:06:53 +01:00
|
|
|
|
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
|
2017-12-11 19:18:02 +01:00
|
|
|
|
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
2018-01-26 19:59:07 +01:00
|
|
|
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
2018-04-15 10:13:39 +02:00
|
|
|
|
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
|
2016-09-22 15:04:14 +02: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 20:37:01 +02:00
|
|
|
|
#:use-module (gnu packages bison)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (gnu packages bootstrap)
|
2016-09-28 16:24:20 +02:00
|
|
|
|
#:use-module (gnu packages cmake)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (gnu packages compression)
|
2016-12-10 14:04:12 +01:00
|
|
|
|
#:use-module (gnu packages curl)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (gnu packages elf)
|
2017-06-17 20:37:01 +02:00
|
|
|
|
#:use-module (gnu packages flex)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (gnu packages gcc)
|
2017-12-10 22:14:01 +01:00
|
|
|
|
#:use-module (gnu packages gdb)
|
2016-09-28 16:24:20 +02:00
|
|
|
|
#:use-module (gnu packages jemalloc)
|
2017-06-17 20:37:01 +02:00
|
|
|
|
#:use-module (gnu packages linux)
|
2016-09-28 16:24:20 +02:00
|
|
|
|
#:use-module (gnu packages llvm)
|
2016-12-10 14:04:12 +01:00
|
|
|
|
#:use-module (gnu packages pkg-config)
|
2016-09-28 16:24:20 +02:00
|
|
|
|
#:use-module (gnu packages python)
|
2016-12-10 14:04:12 +01:00
|
|
|
|
#:use-module (gnu packages ssh)
|
|
|
|
|
#:use-module (gnu packages tls)
|
2016-09-28 16:24:20 +02:00
|
|
|
|
#:use-module (gnu packages version-control)
|
2017-12-10 22:14:01 +01:00
|
|
|
|
#:use-module (gnu packages)
|
2016-12-10 14:04:12 +01:00
|
|
|
|
#:use-module (guix build-system cargo)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
|
#:use-module (guix build-system trivial)
|
|
|
|
|
#:use-module (guix download)
|
2018-04-15 10:13:39 +02:00
|
|
|
|
#:use-module (guix git-download)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
|
|
|
#:use-module (guix packages)
|
2018-03-13 20:06:53 +01:00
|
|
|
|
#:use-module ((guix build utils) #:select (alist-replace))
|
|
|
|
|
#:use-module (guix utils)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
#:use-module (ice-9 match)
|
|
|
|
|
#:use-module (srfi srfi-26))
|
|
|
|
|
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(define %cargo-reference-project-file "/dev/null")
|
|
|
|
|
(define %cargo-reference-hash
|
|
|
|
|
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
|
2016-09-22 15:04:14 +02:00
|
|
|
|
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(define rust-bootstrap
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(package
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(name "rust-bootstrap")
|
|
|
|
|
(version "1.22.1")
|
|
|
|
|
(source (origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri (string-append
|
|
|
|
|
"https://static.rust-lang.org/dist/"
|
|
|
|
|
"rust-" version "-" %host-type ".tar.gz"))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
|
|
|
|
(match %host-type
|
|
|
|
|
("i686-unknown-linux-gnu"
|
|
|
|
|
"15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr")
|
|
|
|
|
("x86_64-unknown-linux-gnu"
|
|
|
|
|
"1yll78x6b3abnvgjf2b66gvp6mmcb9y9jdiqcwhmgc0z0i0fix4c")
|
|
|
|
|
("armv7-unknown-linux-gnueabihf"
|
|
|
|
|
"138a8l528kzp5wyk1mgjaxs304ac5ms8vlpq0ggjaznm6bn2j7a5")
|
|
|
|
|
("aarch64-unknown-linux-gnu"
|
|
|
|
|
"0z6m9m1rx4d96nvybbfmpscq4dv616m615ijy16d5wh2vx0p4na8")
|
|
|
|
|
("mips64el-unknown-linux-gnuabi64"
|
|
|
|
|
"07k4pcv7jvfa48cscdj8752lby7m7xdl88v3a6na1vs675lhgja2")
|
|
|
|
|
(_ ""))))))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(native-inputs
|
|
|
|
|
`(("patchelf" ,patchelf)))
|
|
|
|
|
(inputs
|
2018-03-13 20:06:53 +01:00
|
|
|
|
`(("gcc" ,(canonical-package gcc))
|
|
|
|
|
("gcc:lib" ,(canonical-package gcc) "lib")
|
2016-09-22 15:04:14 +02:00
|
|
|
|
("zlib" ,zlib)))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(outputs '("out" "cargo"))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(arguments
|
|
|
|
|
`(#:tests? #f
|
|
|
|
|
#:strip-binaries? #f
|
|
|
|
|
#:phases
|
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
|
(delete 'configure)
|
|
|
|
|
(delete 'build)
|
|
|
|
|
(replace 'install
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(cargo-out (assoc-ref outputs "cargo"))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(gcc:lib (assoc-ref inputs "gcc:lib"))
|
|
|
|
|
(libc (assoc-ref inputs "libc"))
|
|
|
|
|
(zlib (assoc-ref inputs "zlib"))
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(ld-so (string-append libc ,(glibc-dynamic-linker)))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(rpath (string-append out "/lib:" zlib "/lib:"
|
|
|
|
|
libc "/lib:" gcc:lib "/lib"))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(cargo-rpath (string-append cargo-out "/lib:" libc "/lib:"
|
|
|
|
|
gcc:lib "/lib"))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(rustc (string-append out "/bin/rustc"))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(rustdoc (string-append out "/bin/rustdoc"))
|
|
|
|
|
(cargo (string-append cargo-out "/bin/cargo"))
|
|
|
|
|
(gcc (assoc-ref inputs "gcc")))
|
|
|
|
|
;; Install rustc/rustdoc
|
|
|
|
|
(invoke "bash" "install.sh"
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(string-append "--prefix=" out)
|
|
|
|
|
(string-append "--components=rustc,"
|
2017-12-10 22:14:01 +01:00
|
|
|
|
"rust-std-" %host-type))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
;; Instal cargo
|
|
|
|
|
(invoke "bash" "install.sh"
|
|
|
|
|
(string-append "--prefix=" cargo-out)
|
|
|
|
|
(string-append "--components=cargo"))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(for-each (lambda (file)
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(invoke "patchelf" "--set-rpath" rpath file))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(cons* rustc rustdoc (find-files out "\\.so$")))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(invoke "patchelf" "--set-rpath" cargo-rpath cargo)
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(for-each (lambda (file)
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(invoke "patchelf" "--set-interpreter" ld-so file))
|
|
|
|
|
(list rustc rustdoc cargo))
|
|
|
|
|
;; Rust requires a C toolchain for linking. The prebuilt
|
|
|
|
|
;; binaries expect a compiler called cc. Thus symlink gcc
|
|
|
|
|
;; to cc.
|
|
|
|
|
(symlink (string-append gcc "/bin/gcc")
|
|
|
|
|
(string-append out "/bin/cc"))
|
|
|
|
|
#t))))))
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(home-page "https://www.rust-lang.org")
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(synopsis "Prebuilt rust compiler and cargo package manager")
|
|
|
|
|
(description "This package provides a pre-built @command{rustc} compiler
|
|
|
|
|
and a pre-built @command{cargo} package manaer, which can
|
|
|
|
|
in turn be used to build the final Rust.")
|
2016-09-22 15:04:14 +02:00
|
|
|
|
(license license:asl2.0)))
|
|
|
|
|
|
2017-12-10 22:14:01 +01:00
|
|
|
|
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(define (rust-source version hash)
|
|
|
|
|
(origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri (string-append "https://static.rust-lang.org/dist/"
|
|
|
|
|
"rustc-" version "-src.tar.gz"))
|
|
|
|
|
(sha256 (base32 hash))
|
|
|
|
|
(modules '((guix build utils)))
|
|
|
|
|
(snippet '(begin (delete-file-recursively "src/llvm") #t))))
|
|
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(define-public rust-1.19
|
2016-09-28 16:24:20 +02:00
|
|
|
|
(package
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(name "rust")
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(version "1.19.0")
|
|
|
|
|
(source (rust-source version "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm"))
|
|
|
|
|
(outputs '("out" "cargo"))
|
2016-09-28 16:24:20 +02:00
|
|
|
|
(arguments
|
2017-12-10 22:14:01 +01:00
|
|
|
|
`(#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums'
|
|
|
|
|
#:phases
|
2016-09-28 16:24:20 +02:00
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
|
(add-after 'unpack 'set-env
|
2018-04-15 10:05:14 +02:00
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
;; Disable test for cross compilation support.
|
|
|
|
|
(setenv "CFG_DISABLE_CROSS_TESTS" "1")
|
2016-09-28 16:24:20 +02:00
|
|
|
|
(setenv "SHELL" (which "sh"))
|
2017-03-22 12:45:48 +01:00
|
|
|
|
(setenv "CONFIG_SHELL" (which "sh"))
|
2018-04-15 10:05:14 +02:00
|
|
|
|
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
2017-12-10 22:14:01 +01:00
|
|
|
|
;; guix llvm-3.9.1 package installs only shared libraries
|
|
|
|
|
(setenv "LLVM_LINK_SHARED" "1")
|
2017-03-22 12:45:48 +01:00
|
|
|
|
#t))
|
2017-03-18 10:31:26 +01:00
|
|
|
|
(add-after 'unpack 'patch-tests
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
2017-03-22 17:40:06 +01:00
|
|
|
|
(let ((bash (assoc-ref inputs "bash")))
|
|
|
|
|
(substitute* "src/libstd/process.rs"
|
2017-06-17 20:37:01 +02:00
|
|
|
|
;; The newline is intentional.
|
|
|
|
|
;; There's a line length "tidy" check in Rust which would
|
|
|
|
|
;; fail otherwise.
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(("\"/bin/sh\"") (string-append "\n\"" bash "/bin/sh\"")))
|
|
|
|
|
(substitute* "src/libstd/net/tcp.rs"
|
|
|
|
|
;; There is no network in build environment
|
|
|
|
|
(("fn connect_timeout_unroutable")
|
|
|
|
|
"#[ignore]\nfn connect_timeout_unroutable"))
|
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
|
2017-06-17 20:37:01 +02:00
|
|
|
|
(substitute* "src/libstd/sys/unix/process/process_common.rs"
|
2018-04-15 23:45:34 +02:00
|
|
|
|
(("fn test_process_mask") "#[allow(unused_attributes)]
|
|
|
|
|
#[ignore]
|
2018-04-15 10:16:41 +02:00
|
|
|
|
fn test_process_mask"))
|
2017-06-17 20:37:01 +02:00
|
|
|
|
;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH.
|
2017-12-10 22:14:01 +01:00
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00193.html>
|
2017-06-17 20:37:01 +02:00
|
|
|
|
(delete-file-recursively "src/test/run-make/linker-output-non-utf8")
|
2018-04-18 08:40:06 +02:00
|
|
|
|
(substitute* "src/librustc_back/dynamic_lib.rs"
|
|
|
|
|
;; This test is known to fail on aarch64 and powerpc64le:
|
|
|
|
|
;; https://github.com/rust-lang/rust/issues/45410
|
|
|
|
|
(("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine"))
|
2017-03-22 17:40:06 +01:00
|
|
|
|
#t)))
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(lambda* _
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(substitute* "src/Cargo.lock"
|
|
|
|
|
(("(\"checksum .* = )\".*\"" all name)
|
|
|
|
|
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (filename)
|
|
|
|
|
(use-modules (guix build cargo-build-system))
|
|
|
|
|
(delete-file filename)
|
|
|
|
|
(let* ((dir (dirname filename)))
|
|
|
|
|
(display (string-append
|
|
|
|
|
"patch-cargo-checksums: generate-checksums for "
|
|
|
|
|
dir "\n"))
|
|
|
|
|
(generate-checksums dir ,%cargo-reference-project-file)))
|
|
|
|
|
(find-files "src/vendor" ".cargo-checksum.json"))
|
|
|
|
|
#t))
|
2016-09-28 16:24:20 +02:00
|
|
|
|
(replace 'configure
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(const #t))
|
|
|
|
|
(replace 'check
|
|
|
|
|
(const #t))
|
|
|
|
|
(replace 'install
|
|
|
|
|
(const #t)))))
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(native-inputs
|
|
|
|
|
`(("bison" ,bison) ; For the tests
|
|
|
|
|
("cmake" ,cmake)
|
|
|
|
|
("flex" ,flex) ; For the tests
|
|
|
|
|
("gdb" ,gdb) ; For the tests
|
|
|
|
|
("git" ,git)
|
|
|
|
|
("procps" ,procps) ; For the tests
|
|
|
|
|
("python-2" ,python-2)
|
|
|
|
|
("rustc-bootstrap" ,rust-bootstrap)
|
|
|
|
|
("cargo-bootstrap" ,rust-bootstrap "cargo")
|
|
|
|
|
("pkg-config" ,pkg-config) ; For "cargo"
|
|
|
|
|
("which" ,which)))
|
|
|
|
|
(inputs
|
|
|
|
|
`(("jemalloc" ,jemalloc-4.5.0)
|
|
|
|
|
("llvm" ,llvm-3.9.1)
|
|
|
|
|
("openssl" ,openssl)
|
|
|
|
|
("libcurl" ,curl))) ; For "cargo"
|
2018-05-10 00:27:17 +02:00
|
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
;; rustc invokes gcc, so we need to set its search paths accordingly.
|
2018-05-10 00:27:17 +02:00
|
|
|
|
;; Note: duplicate its value here to cope with circular dependencies among
|
|
|
|
|
;; modules (see <https://bugs.gnu.org/31392>).
|
|
|
|
|
(native-search-paths
|
|
|
|
|
(list (search-path-specification
|
|
|
|
|
(variable "C_INCLUDE_PATH")
|
|
|
|
|
(files '("include")))
|
|
|
|
|
(search-path-specification
|
|
|
|
|
(variable "CPLUS_INCLUDE_PATH")
|
|
|
|
|
(files '("include")))
|
|
|
|
|
(search-path-specification
|
|
|
|
|
(variable "LIBRARY_PATH")
|
|
|
|
|
(files '("lib" "lib64")))))
|
|
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(synopsis "Compiler for the Rust progamming language")
|
|
|
|
|
(description "Rust is a systems programming language that provides memory
|
|
|
|
|
safety and thread safety guarantees.")
|
|
|
|
|
(home-page "https://www.rust-lang.org")
|
|
|
|
|
;; Dual licensed.
|
|
|
|
|
(license (list license:asl2.0 license:expat))))
|
|
|
|
|
|
2018-04-02 18:47:58 +02:00
|
|
|
|
(define (rust-bootstrapped-package base-rust version checksum)
|
|
|
|
|
"Bootstrap rust VERSION with source checksum CHECKSUM using BASE-RUST."
|
|
|
|
|
(package
|
|
|
|
|
(inherit base-rust)
|
|
|
|
|
(version version)
|
|
|
|
|
(source
|
|
|
|
|
(rust-source version checksum))
|
|
|
|
|
(native-inputs
|
|
|
|
|
(alist-replace "cargo-bootstrap" (list base-rust "cargo")
|
|
|
|
|
(alist-replace "rustc-bootstrap" (list base-rust)
|
|
|
|
|
(package-native-inputs base-rust))))))
|
|
|
|
|
|
2018-04-15 10:13:39 +02:00
|
|
|
|
(define-public mrustc
|
2018-05-23 20:32:44 +02:00
|
|
|
|
(let ((commit "b5b70897015ee70d62ddda9711c256ca7c720e0f")
|
|
|
|
|
(revision "3")
|
2018-04-15 10:13:39 +02:00
|
|
|
|
(rustc-version "1.19.0"))
|
|
|
|
|
(package
|
|
|
|
|
(name "mrustc")
|
|
|
|
|
(version (git-version "0.0.0" revision commit))
|
|
|
|
|
(source (origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://github.com/thepowersgang/mrustc.git")
|
|
|
|
|
(commit commit)))
|
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
2018-05-23 20:32:44 +02:00
|
|
|
|
"1d6jr6agiy598ab8lax0h9dfn9n67wg906y1f46l1c27sz3w82lb"))))
|
2018-04-15 10:13:39 +02:00
|
|
|
|
(outputs '("out" "cargo"))
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(inputs
|
|
|
|
|
`(("llvm" ,llvm-3.9.1)))
|
|
|
|
|
(native-inputs
|
|
|
|
|
`(("bison" ,bison)
|
|
|
|
|
("flex" ,flex)
|
|
|
|
|
;; Required for the libstd sources.
|
|
|
|
|
("rustc"
|
|
|
|
|
,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm"))))
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:tests? #f
|
|
|
|
|
#:make-flags (list (string-append "LLVM_CONFIG="
|
|
|
|
|
(assoc-ref %build-inputs "llvm")
|
|
|
|
|
"/bin/llvm-config"))
|
|
|
|
|
#:phases
|
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
|
(add-after 'unpack 'unpack-target-compiler
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(substitute* "minicargo.mk"
|
|
|
|
|
;; Don't try to build LLVM.
|
|
|
|
|
(("^[$][(]LLVM_CONFIG[)]:") "xxx:")
|
|
|
|
|
;; Build for the correct target architecture.
|
|
|
|
|
(("^RUSTC_TARGET := x86_64-unknown-linux-gnu")
|
|
|
|
|
(string-append "RUSTC_TARGET := "
|
|
|
|
|
,(or (%current-target-system)
|
|
|
|
|
(nix-system->gnu-triplet
|
|
|
|
|
(%current-system))))))
|
|
|
|
|
(invoke "tar" "xf" (assoc-ref inputs "rustc"))
|
|
|
|
|
(chdir "rustc-1.19.0-src")
|
|
|
|
|
(invoke "patch" "-p0" "../rust_src.patch")
|
|
|
|
|
(chdir "..")
|
|
|
|
|
#t))
|
2018-05-18 01:55:29 +02:00
|
|
|
|
(replace 'configure
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
|
|
|
|
#t))
|
2018-04-15 10:13:39 +02:00
|
|
|
|
(add-after 'build 'build-minicargo
|
|
|
|
|
(lambda _
|
|
|
|
|
(for-each (lambda (target)
|
|
|
|
|
(invoke "make" "-f" "minicargo.mk" target))
|
|
|
|
|
'("output/libstd.hir" "output/libpanic_unwind.hir"
|
|
|
|
|
"output/libproc_macro.hir" "output/libtest.hir"))
|
|
|
|
|
;; Technically the above already does it - but we want to be clear.
|
|
|
|
|
(invoke "make" "-C" "tools/minicargo")))
|
|
|
|
|
(replace 'install
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
|
(tools-bin (string-append out "/tools/bin"))
|
|
|
|
|
(cargo-out (assoc-ref outputs "cargo"))
|
|
|
|
|
(cargo-bin (string-append cargo-out "/bin"))
|
|
|
|
|
(lib (string-append out "/lib"))
|
|
|
|
|
(lib/rust (string-append lib "/mrust"))
|
|
|
|
|
(gcc (assoc-ref inputs "gcc")))
|
|
|
|
|
;; These files are not reproducible.
|
|
|
|
|
(for-each delete-file (find-files "output" "\\.txt$"))
|
|
|
|
|
(mkdir-p lib)
|
|
|
|
|
(copy-recursively "output" lib/rust)
|
|
|
|
|
(mkdir-p bin)
|
|
|
|
|
(mkdir-p tools-bin)
|
|
|
|
|
(install-file "bin/mrustc" bin)
|
|
|
|
|
;; minicargo uses relative paths to resolve mrustc.
|
|
|
|
|
(install-file "tools/bin/minicargo" tools-bin)
|
|
|
|
|
(install-file "tools/bin/minicargo" cargo-bin)
|
|
|
|
|
#t))))))
|
|
|
|
|
(synopsis "Compiler for the Rust progamming language")
|
|
|
|
|
(description "Rust is a systems programming language that provides memory
|
|
|
|
|
safety and thread safety guarantees.")
|
|
|
|
|
(home-page "https://github.com/thepowersgang/mrustc")
|
|
|
|
|
;; Dual licensed.
|
|
|
|
|
(license (list license:asl2.0 license:expat)))))
|
|
|
|
|
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(define-public rust-1.23
|
|
|
|
|
(package
|
|
|
|
|
(inherit rust-1.19)
|
|
|
|
|
(name "rust")
|
|
|
|
|
(version "1.23.0")
|
|
|
|
|
(source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))
|
|
|
|
|
(outputs '("out" "doc" "cargo"))
|
|
|
|
|
(arguments
|
|
|
|
|
(substitute-keyword-arguments (package-arguments rust-1.19)
|
|
|
|
|
((#:phases phases)
|
|
|
|
|
`(modify-phases ,phases
|
2018-03-22 08:14:53 +01:00
|
|
|
|
(add-after 'unpack 'dont-build-native
|
|
|
|
|
(lambda _
|
|
|
|
|
;; XXX: Revisit this when we use gcc 6.
|
|
|
|
|
(substitute* "src/binaryen/CMakeLists.txt"
|
|
|
|
|
(("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
|
|
|
|
|
#t))
|
2018-04-15 10:05:14 +02:00
|
|
|
|
(add-after 'patch-tests 'patch-cargo-tests
|
|
|
|
|
(lambda _
|
|
|
|
|
(substitute* "src/tools/cargo/tests/build.rs"
|
|
|
|
|
(("/usr/bin/env") (which "env"))
|
|
|
|
|
;; Guix llvm is compiled without asmjs-unknown-emscripten.
|
|
|
|
|
(("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs"))
|
|
|
|
|
(substitute* "src/tools/cargo/tests/death.rs"
|
|
|
|
|
;; This is stuck when built in container.
|
|
|
|
|
(("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone"))
|
|
|
|
|
#t))
|
|
|
|
|
(add-after 'patch-cargo-tests 'fix-mtime-bug
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
(lambda* _
|
|
|
|
|
(substitute* "src/build_helper/lib.rs"
|
|
|
|
|
;; Bug in Rust code.
|
|
|
|
|
;; Current implementation assume that if dst not exist then it's mtime
|
|
|
|
|
;; is 0, but in same time "src" have 0 mtime in guix build!
|
|
|
|
|
(("let threshold = mtime\\(dst\\);")
|
|
|
|
|
"if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);"))
|
|
|
|
|
#t))
|
|
|
|
|
(replace 'configure
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
|
(doc (assoc-ref outputs "doc"))
|
|
|
|
|
(gcc (assoc-ref inputs "gcc"))
|
|
|
|
|
(gdb (assoc-ref inputs "gdb"))
|
|
|
|
|
(binutils (assoc-ref inputs "binutils"))
|
|
|
|
|
(python (assoc-ref inputs "python-2"))
|
|
|
|
|
(rustc (assoc-ref inputs "rustc-bootstrap"))
|
|
|
|
|
(cargo (assoc-ref inputs "cargo-bootstrap"))
|
|
|
|
|
(llvm (assoc-ref inputs "llvm"))
|
|
|
|
|
(jemalloc (assoc-ref inputs "jemalloc")))
|
|
|
|
|
(call-with-output-file "config.toml"
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display (string-append "
|
2017-12-10 22:14:01 +01:00
|
|
|
|
[llvm]
|
|
|
|
|
[build]
|
|
|
|
|
cargo = \"" cargo "/bin/cargo" "\"
|
|
|
|
|
rustc = \"" rustc "/bin/rustc" "\"
|
2018-03-13 20:06:53 +01:00
|
|
|
|
docs = true
|
2017-12-10 22:14:01 +01:00
|
|
|
|
python = \"" python "/bin/python2" "\"
|
|
|
|
|
gdb = \"" gdb "/bin/gdb" "\"
|
|
|
|
|
vendor = true
|
|
|
|
|
submodules = false
|
|
|
|
|
[install]
|
|
|
|
|
prefix = \"" out "\"
|
2018-03-13 20:06:53 +01:00
|
|
|
|
docdir = \"" doc "/share/doc/rust" "\"
|
|
|
|
|
sysconfdir = \"etc\"
|
|
|
|
|
localstatedir = \"var/lib\"
|
2017-12-10 22:14:01 +01:00
|
|
|
|
[rust]
|
|
|
|
|
default-linker = \"" gcc "/bin/gcc" "\"
|
|
|
|
|
channel = \"stable\"
|
|
|
|
|
rpath = true
|
|
|
|
|
# There is 2 failed codegen tests:
|
|
|
|
|
# codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs
|
|
|
|
|
# This tests required patched LLVM
|
|
|
|
|
codegen-tests = false
|
|
|
|
|
[target." %host-type "]
|
|
|
|
|
llvm-config = \"" llvm "/bin/llvm-config" "\"
|
|
|
|
|
cc = \"" gcc "/bin/gcc" "\"
|
|
|
|
|
cxx = \"" gcc "/bin/g++" "\"
|
2018-03-13 20:06:53 +01:00
|
|
|
|
ar = \"" binutils "/bin/ar" "\"
|
2017-12-10 22:14:01 +01:00
|
|
|
|
jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
|
|
|
|
|
[dist]
|
|
|
|
|
") port)))
|
|
|
|
|
#t)))
|
|
|
|
|
(add-before 'build 'reset-timestamps-after-changes
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(lambda* _
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(define ref (stat "README.md"))
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (filename)
|
|
|
|
|
(set-file-time filename ref))
|
|
|
|
|
(find-files "." #:directories? #t))
|
|
|
|
|
#t))
|
|
|
|
|
(replace 'build
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(lambda* _
|
|
|
|
|
(invoke "./x.py" "build")
|
|
|
|
|
(invoke "./x.py" "build" "src/tools/cargo")))
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(replace 'check
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(lambda* _
|
2018-04-15 10:05:14 +02:00
|
|
|
|
(invoke "./x.py" "test")
|
|
|
|
|
(invoke "./x.py" "test" "src/tools/cargo")))
|
2017-12-10 22:14:01 +01:00
|
|
|
|
(replace 'install
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
|
(invoke "./x.py" "install")
|
|
|
|
|
(substitute* "config.toml"
|
|
|
|
|
;; replace prefix to specific output
|
|
|
|
|
(("prefix = \"[^\"]*\"")
|
|
|
|
|
(string-append "prefix = \"" (assoc-ref outputs "cargo") "\"")))
|
|
|
|
|
(invoke "./x.py" "install" "cargo")
|
|
|
|
|
#t))
|
2017-01-09 12:31:31 +01:00
|
|
|
|
(add-after 'install 'wrap-rustc
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(let ((out (assoc-ref outputs "out"))
|
|
|
|
|
(libc (assoc-ref inputs "libc"))
|
|
|
|
|
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
|
|
|
|
|
;; Let gcc find ld and libc startup files.
|
|
|
|
|
(wrap-program (string-append out "/bin/rustc")
|
|
|
|
|
`("PATH" ":" prefix (,(string-append ld-wrapper "/bin")))
|
2017-03-22 12:45:48 +01:00
|
|
|
|
`("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib"))))
|
gnu: Add rust@1.19.0.
* gnu/packages/rust.scm (rust-1.23)[build-system, native-inputs, inputs,
native-search-paths, synopsis, description, home-page, license]: Move to...
(rust-1.19): ... here. New variable.
(rust-1.23)[arguments]<#:phases>[set-env, patch-tests, patch-cargo-checksums]:
Move to...
(rust-1.19): ... here.
(rust-1.19)[arguments]<#:phases>[configure, check, install]: Replace by no-op.
2018-04-02 19:15:06 +02:00
|
|
|
|
#t)))))))))
|
2016-12-10 14:04:12 +01:00
|
|
|
|
|
2018-04-15 10:11:37 +02:00
|
|
|
|
(define-public rust-1.24
|
2018-04-02 18:47:58 +02:00
|
|
|
|
(let ((base-rust
|
|
|
|
|
(rust-bootstrapped-package rust-1.23 "1.24.1"
|
|
|
|
|
"1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y")))
|
2018-03-13 20:06:53 +01:00
|
|
|
|
(package
|
|
|
|
|
(inherit base-rust)
|
|
|
|
|
(arguments
|
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
2018-04-02 18:47:58 +02:00
|
|
|
|
((#:phases phases)
|
|
|
|
|
`(modify-phases ,phases
|
2018-04-18 08:40:06 +02:00
|
|
|
|
(replace 'patch-tests
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((bash (assoc-ref inputs "bash")))
|
|
|
|
|
(substitute* "src/libstd/process.rs"
|
|
|
|
|
;; The newline is intentional.
|
|
|
|
|
;; There's a line length "tidy" check in Rust which would
|
|
|
|
|
;; fail otherwise.
|
|
|
|
|
(("\"/bin/sh\"") (string-append "\n\"" bash "/bin/sh\"")))
|
|
|
|
|
(substitute* "src/libstd/net/tcp.rs"
|
|
|
|
|
;; There is no network in build environment
|
|
|
|
|
(("fn connect_timeout_unroutable")
|
|
|
|
|
"#[ignore]\nfn connect_timeout_unroutable"))
|
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
|
|
|
|
|
(substitute* "src/libstd/sys/unix/process/process_common.rs"
|
|
|
|
|
(("fn test_process_mask") "#[allow(unused_attributes)]
|
|
|
|
|
#[ignore]
|
|
|
|
|
fn test_process_mask"))
|
|
|
|
|
;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH.
|
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00193.html>
|
|
|
|
|
(delete-file-recursively "src/test/run-make/linker-output-non-utf8")
|
|
|
|
|
(substitute* "src/librustc_metadata/dynamic_lib.rs"
|
|
|
|
|
;; This test is known to fail on aarch64 and powerpc64le:
|
|
|
|
|
;; https://github.com/rust-lang/rust/issues/45410
|
|
|
|
|
(("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine"))
|
|
|
|
|
#t)))
|
2018-04-02 18:47:58 +02:00
|
|
|
|
(delete 'fix-mtime-bug))))))))
|
2018-04-15 10:11:37 +02:00
|
|
|
|
|
|
|
|
|
(define-public rust
|
|
|
|
|
(let ((base-rust rust-1.24))
|
|
|
|
|
(package
|
|
|
|
|
(inherit base-rust)
|
|
|
|
|
(version "1.25.0")
|
|
|
|
|
(source
|
|
|
|
|
(rust-source version
|
|
|
|
|
"0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"))
|
|
|
|
|
(native-inputs
|
|
|
|
|
(alist-replace "cargo-bootstrap" (list base-rust "cargo")
|
|
|
|
|
(alist-replace "rustc-bootstrap" (list base-rust)
|
|
|
|
|
(package-native-inputs base-rust))))
|
|
|
|
|
(arguments
|
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
|
((#:phases phases)
|
|
|
|
|
`(modify-phases ,phases
|
|
|
|
|
(add-after 'patch-cargo-tests 'patch-cargo-index-update
|
|
|
|
|
(lambda* _
|
|
|
|
|
(substitute* "src/tools/cargo/tests/generate-lockfile.rs"
|
|
|
|
|
;; This test wants to update the crate index.
|
|
|
|
|
(("fn no_index_update") "#[ignore]\nfn no_index_update")))))))))))
|