From patchwork Mon Apr 19 11:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 28657 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 114E027BC77; Mon, 19 Apr 2021 12:32:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 73BD827BC6C for ; Mon, 19 Apr 2021 12:32:24 +0100 (BST) Received: from localhost ([::1]:39574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYS8d-0002ZE-LI for patchwork@mira.cbaines.net; Mon, 19 Apr 2021 07:32:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYS8L-0002Xl-B3 for guix-patches@gnu.org; Mon, 19 Apr 2021 07:32:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYS8I-0001GU-Gr for guix-patches@gnu.org; Mon, 19 Apr 2021 07:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYS8I-0001rV-EQ for guix-patches@gnu.org; Mon, 19 Apr 2021 07:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47890] [PATCH][CORE-UPDATES] gnu: rust: Re-use llvm versions. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Apr 2021 11:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47890@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16188318724573 (code B ref -1); Mon, 19 Apr 2021 11:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Apr 2021 11:31:12 +0000 Received: from localhost ([127.0.0.1]:48555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYS7O-00015x-Ga for submit@debbugs.gnu.org; Mon, 19 Apr 2021 07:31:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:39872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYS7L-000132-MA for submit@debbugs.gnu.org; Mon, 19 Apr 2021 07:31:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYS7L-0001zg-G9 for guix-patches@gnu.org; Mon, 19 Apr 2021 07:31:03 -0400 Received: from flashner.co.il ([178.62.234.194]:54120) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYS7J-0000HL-9C for guix-patches@gnu.org; Mon, 19 Apr 2021 07:31:03 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 9732640363; Mon, 19 Apr 2021 11:30:28 +0000 (UTC) From: Efraim Flashner Date: Mon, 19 Apr 2021 14:29:41 +0300 Message-Id: <20210419112941.10155-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: b66269db5f91ea79524505fdad018aac2055bd99 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 ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov -;;; Copyright © 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov @@ -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