GNU bug report logs - #47890
[PATCH][CORE-UPDATES] gnu: rust: Re-use llvm versions.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 47890 in the body.
You can then email your comments to 47890 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: guix-patches <at> gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH][CORE-UPDATES] gnu: rust: Re-use llvm versions.
Date: Mon, 19 Apr 2021 14:29:41 +0300

* 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(-)

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 <at> n0.is>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben <at> gmail.com>
 ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov <at> member.fsf.org>
-;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2017, 2019, 2020, 2021 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Danny Milosavljevic <dannym+a <at> scratchpost.org>
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov <at> 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

Message #10 received at 47890-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 47890-done <at> debbugs.gnu.org
Subject: Re: [PATCH][CORE-UPDATES] gnu: rust: Re-use llvm versions.
Date: Tue, 4 May 2021 15:25:08 +0300

[Message part 1 (text/plain, inline)]

Patch pushed

-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.