[PATCH][CORE-UPDATES] gnu: rust: Re-use llvm versions.

  • Done
  • quality assurance status badge
Details
One participant
  • Efraim Flashner
Owner
unassigned
Submitted by
Efraim Flashner
Severity
normal
E
E
Efraim Flashner wrote on 19 Apr 2021 13:29
(address . guix-patches@gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
20210419112941.10155-1-efraim@flashner.co.il
* gnu/packages/rust.scm (rust-1.35)[inputs]: Don't replace llvm.
(rust-1.38)[inputs]: Same.
(rust-1.44)[inputs]: Switch to llvm-10.
(rust-1.45)[inputs]: Don't replace llvm.
(rust-1.47)[inputs]: Same.
---
gnu/packages/rust.scm | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)

Toggle diff (95 lines)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 162371026c..cc056456e9 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
-;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
@@ -157,6 +157,7 @@
`(("libcurl" ,curl)
("libssh2" ,libssh2)
;; Use llvm-7, which enables rust to be built reproducibly.
+ ;; Versions newer than 7 fail to compile.
("llvm" ,llvm-7)
("openssl" ,openssl)
("zlib" ,zlib)))
@@ -546,8 +547,6 @@ safety and thread safety guarantees.")
"0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas")))
(package
(inherit base-rust)
- (inputs
- (alist-replace "llvm" (list llvm-8) (package-inputs base-rust)))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
@@ -575,13 +574,8 @@ safety and thread safety guarantees.")
(setenv "CARGO_HOME" cargo-home)))))))))))
(define rust-1.38
- (let ((base-rust (rust-bootstrapped-package
- rust-1.37 "1.38.0"
- "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4")))
- (package
- (inherit base-rust)
- (inputs
- (alist-replace "llvm" (list llvm-9) (package-inputs base-rust))))))
+ (rust-bootstrapped-package
+ rust-1.37 "1.38.0" "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))
(define rust-1.39
(let ((base-rust (rust-bootstrapped-package
@@ -649,9 +643,15 @@ safety and thread safety guarantees.")
(rust-bootstrapped-package
rust-1.42 "1.43.0" "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm"))
+;; This version needs llvm >= 8.0 and NOT 11
(define rust-1.44
- (rust-bootstrapped-package
- rust-1.43 "1.44.1" "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"))
+ (let ((base-rust (rust-bootstrapped-package
+ rust-1.43 "1.44.1"
+ "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky")))
+ (package
+ (inherit base-rust)
+ (inputs
+ (alist-replace "llvm" (list llvm-10) (package-inputs base-rust))))))
(define rust-1.45
(let ((base-rust (rust-bootstrapped-package
@@ -659,8 +659,6 @@ safety and thread safety guarantees.")
"0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp")))
(package
(inherit base-rust)
- (inputs
- (alist-replace "llvm" (list llvm-10) (package-inputs base-rust)))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
@@ -718,14 +716,9 @@ safety and thread safety guarantees.")
(format #f "prefix = ~s" (assoc-ref outputs "rustfmt"))))
(invoke "./x.py" "install" "rustfmt"))))))))))
-(define-public rust-1.47
- (let ((base-rust (rust-bootstrapped-package
- rust-1.46 "1.47.0"
- "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
- (package
- (inherit base-rust)
- (inputs
- (alist-replace "llvm" (list llvm-11) (package-inputs base-rust))))))
+(define rust-1.47
+ (rust-bootstrapped-package
+ rust-1.46 "1.47.0" "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i"))
(define rust-1.48
(rust-bootstrapped-package

base-commit: b66269db5f91ea79524505fdad018aac2055bd99
--
2.31.1
E
E
Efraim Flashner wrote on 4 May 2021 14:25
(address . 47890-done@debbugs.gnu.org)
YJE9JCmFGU+ybggw@3900XT
Patch pushed

--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmCRPRwACgkQQarn3Mo9
g1FLog/+NmmapLFk5c9nCYHtzvPLyKneWtOp+TOpsBa6YSr9ZxVBWvVr+bPRaDo8
R1h7391n8lpWPngp+54YE9LeNOU6Y2zvDUa8/xQwpfGM8PJznmu584P/5nCumdyB
wyr9aYfDe45XeHHM4NpzfuWzM5QRD0ZzbhtpHzdEchz3QrSpO8X/xU/CHX1JzFW6
lCDHC2mi2TLVYQnK5B7selCFMkzfTr87OeupXKCDlDm9IaICATJ/RyrKeDUDRsmb
U3lar5xRX+9sokoiaUjM0Qkh9DT9V4SPZzKWsJxyJvNRSjZu3ja+tldcuoe2blSU
77LNGZZCBpfJjzi/UhrUHHImFwZqTHx2yP7xVoSBmJoRu7fazAKqGf8DXVK8EAw6
J+hkzSE3nutk4Z6zG61HUL9g2pJWd8wIe/ESv5s4YReuHXTALn5psdrjxQov2vsx
eVNX9BIL+OrgDc3lfcBUIdXKX9JTZmSs3J1VQEsqotZ9QWdYRqR4lsgKgJZe6Xuo
8W+lSZ+IjnKkixjpdI1grTaD/OXKjhRvB1hC5Q5HK1yk9f1zU3z8sCYb7GF1Oa/X
OcL4KSbmAmvfnfJ0YApBjQSARbMth9UFPNkIN7qEiehUH+QKff1Pid+MIOpUeqO3
KQRpEt8g+sUpyOpYs31GIijzhhlsvzNZYKOykSQKtLzYeraN8V8=
=HRmu
-----END PGP SIGNATURE-----


Closed
?