diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
| commit | 901236474a9523595c0bdefd5ac22366e78b9e61 (patch) | |
| tree | 667efe648d584b0c960b0da0d577b8a71b6b941c /gnu/packages/rust.scm | |
| parent | 63d4ef52ebad4157817d56ccbe974da8fff81929 (diff) | |
| parent | 64766d5cafd5cf19189ed274eb7e29ef784f90de (diff) | |
| download | guix-patches-901236474a9523595c0bdefd5ac22366e78b9e61.tar guix-patches-901236474a9523595c0bdefd5ac22366e78b9e61.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6e3ea79845..353e2f269b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -105,7 +105,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) + "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) + (patches + (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -746,7 +748,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn thin_lto_works") "#[ignore]\nfn thin_lto_works")) #t))))))))) -(define-public rust +(define-public rust-1.28 (let ((base-rust (rust-bootstrapped-package rust-1.27 "1.28.0" "11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx" @@ -779,3 +781,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #t)) ;; The thinlto test should pass with llvm 6. (delete 'disable-thinlto-test)))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.28 "1.29.2" + "1jb787080z754caa2w3w1amsygs4qlzj9rs1vy64firfmabfg22h" + #:patches + '("rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-reproducible-builds.patch")))) + (package + (inherit base-rust)))) |