From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 06 07:58:14 2020 Received: (at submit) by debbugs.gnu.org; 6 Dec 2020 12:58:14 +0000 Received: from localhost ([127.0.0.1]:49122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kltc8-0004iG-IF for submit@debbugs.gnu.org; Sun, 06 Dec 2020 07:58:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:38232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kltc7-0004i8-1n for submit@debbugs.gnu.org; Sun, 06 Dec 2020 07:58:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kltc6-0007pA-92 for guix-patches@gnu.org; Sun, 06 Dec 2020 07:58:06 -0500 Received: from mail.ftbfs.org ([52.8.68.13]:63568 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kltc3-0001pv-Sd for guix-patches@gnu.org; Sun, 06 Dec 2020 07:58:06 -0500 Received: from ip68-5-94-190.oc.oc.cox.net ([68.5.94.190] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kltc0-0005ZK-Ux; Sun, 06 Dec 2020 12:58:01 +0000 From: Matthew Kraai To: guix-patches@gnu.org Subject: [PATCH] gnu: Add Rust 1.47. Date: Sun, 6 Dec 2020 04:57:53 -0800 Message-Id: <20201206125753.1759-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org 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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Matthew Kraai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/rust.scm (rust-1.47): New variable. --- gnu/packages/rust.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 35a96b5754..4bbb0b6b04 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2020 Matthew Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -1318,5 +1319,41 @@ move around." (rust-bootstrapped-package rust-1.45 "1.46.0" "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid")) +(define-public rust-1.47 + (let ((base-rust + (rust-bootstrapped-package rust-1.46 "1.47.0" + "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "library/std/src/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* "library/std/src/sys/unix/process/process_common.rs" + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] + fn test_process_mask")) + #t))) + (delete 'patch-cargo-checksums) + (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums + ;; Generate checksums after patching generated files (in + ;; particular, vendor/jemalloc/rep/Makefile). + (lambda* _ + (use-modules (guix build cargo-utils)) + (substitute* "Cargo.lock" + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor") + #t))))))))) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 06 08:44:21 2020 Received: (at 45070) by debbugs.gnu.org; 6 Dec 2020 13:44:21 +0000 Received: from localhost ([127.0.0.1]:49197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kluKr-0001cw-JW for submit@debbugs.gnu.org; Sun, 06 Dec 2020 08:44:21 -0500 Received: from mail.ftbfs.org ([52.8.68.13]:58610 helo=aws.ftbfs.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kluKq-0001ch-Op for 45070@debbugs.gnu.org; Sun, 06 Dec 2020 08:44:21 -0500 Received: from ip68-5-94-190.oc.oc.cox.net ([68.5.94.190] helo=[192.168.1.12]) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kluKk-0005fm-Un for 45070@debbugs.gnu.org; Sun, 06 Dec 2020 13:44:15 +0000 Subject: Re: bug#45070: Acknowledgement ([PATCH] gnu: Add Rust 1.47.) To: 45070@debbugs.gnu.org References: <20201206125753.1759-1-kraai@ftbfs.org> From: Matthew Kraai Message-ID: <7f7757b2-b0d9-c4a7-9fa5-591d98f1d339@ftbfs.org> Date: Sun, 6 Dec 2020 05:44:14 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45070 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Sorry, after sending this I remembered that Rust 1.47.0 upgraded to LLVM 11.  I'm testing an updated patch which upgrades the input to llvm-11. -- Matthew Kraai From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 06 19:03:26 2020 Received: (at 45070) by debbugs.gnu.org; 7 Dec 2020 00:03:26 +0000 Received: from localhost ([127.0.0.1]:51768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1km3zt-0005IS-TW for submit@debbugs.gnu.org; Sun, 06 Dec 2020 19:03:26 -0500 Received: from mail.ftbfs.org ([52.8.68.13]:58888 helo=aws.ftbfs.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1km3zq-0005IF-Mj for 45070@debbugs.gnu.org; Sun, 06 Dec 2020 19:03:19 -0500 Received: from ip68-5-94-190.oc.oc.cox.net ([68.5.94.190] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1km3zk-0000zl-Js; Mon, 07 Dec 2020 00:03:12 +0000 From: Matthew Kraai To: 45070@debbugs.gnu.org Subject: [PATCH] gnu: Add Rust 1.47. Date: Sun, 6 Dec 2020 16:03:09 -0800 Message-Id: <20201207000309.24779-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <7f7757b2-b0d9-c4a7-9fa5-591d98f1d339@ftbfs.org> References: <7f7757b2-b0d9-c4a7-9fa5-591d98f1d339@ftbfs.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1, URIBL_BLOCKED=0.001 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45070 Cc: Matthew Kraai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/rust.scm (rust-1.47): New variable. --- gnu/packages/rust.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 35a96b5754..1a79927c45 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2020 Matthew Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -1318,5 +1319,44 @@ move around." (rust-bootstrapped-package rust-1.45 "1.46.0" "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid")) +(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))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "library/std/src/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* "library/std/src/sys/unix/process/process_common.rs" + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] + fn test_process_mask")) + #t))) + (delete 'patch-cargo-checksums) + (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums + ;; Generate checksums after patching generated files (in + ;; particular, vendor/jemalloc/rep/Makefile). + (lambda* _ + (use-modules (guix build cargo-utils)) + (substitute* "Cargo.lock" + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor") + #t))))))))) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 07 17:47:53 2020 Received: (at 45070) by debbugs.gnu.org; 7 Dec 2020 22:47:53 +0000 Received: from localhost ([127.0.0.1]:55818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmPIP-0004Y3-Gm for submit@debbugs.gnu.org; Mon, 07 Dec 2020 17:47:53 -0500 Received: from mail.ftbfs.org ([52.8.68.13]:59490 helo=aws.ftbfs.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmPIN-0004Xp-Bw for 45070@debbugs.gnu.org; Mon, 07 Dec 2020 17:47:51 -0500 Received: from ip68-5-94-190.oc.oc.cox.net ([68.5.94.190] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmPIH-0006Is-8c; Mon, 07 Dec 2020 22:47:45 +0000 From: Matthew Kraai To: 45070@debbugs.gnu.org Subject: [PATCH] gnu: Add Rust 1.48. Date: Mon, 7 Dec 2020 14:47:39 -0800 Message-Id: <20201207224739.13003-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1, URIBL_BLOCKED=0.001 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45070 Cc: Matthew Kraai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/rust.scm (rust-1.48): New variable. --- .../patches/rust-1.48-linker-locale.patch | 14 +++++++++ gnu/packages/rust.scm | 29 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/rust-1.48-linker-locale.patch diff --git a/gnu/packages/patches/rust-1.48-linker-locale.patch b/gnu/packages/patches/rust-1.48-linker-locale.patch new file mode 100644 index 0000000000..d06dcbe682 --- /dev/null +++ b/gnu/packages/patches/rust-1.48-linker-locale.patch @@ -0,0 +1,14 @@ +https://github.com/rust-lang/rust/pull/74416 +diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs +index 3df956c465e..f45fee45be4 100644 +--- a/compiler/rustc_codegen_ssa/src/back/linker.rs ++++ b/compiler/rustc_codegen_ssa/src/back/linker.rs +@@ -28,7 +28,7 @@ + pub fn disable_localization(linker: &mut Command) { + // No harm in setting both env vars simultaneously. + // Unix-style linkers. +- linker.env("LC_ALL", "C"); ++ linker.env("LC_ALL", "en_US.UTF-8"); + // MSVC's `link.exe`. + linker.env("VSLANG", "1033"); + } diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1a79927c45..714d04ba14 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1358,5 +1358,34 @@ move around." (generate-all-checksums "vendor") #t))))))))) +(define-public rust-1.48 + (let ((base-rust + (rust-bootstrapped-package rust-1.47 "1.48.0" + "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches (search-patches "rust-1.48-linker-locale.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "library/std/src/process/tests.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* "library/std/src/sys/unix/process/process_common/tests.rs" + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] + fn test_process_mask")) + #t)))))))))) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 02 19:08:22 2021 Received: (at 45070-done) by debbugs.gnu.org; 3 Jan 2021 00:08:22 +0000 Received: from localhost ([127.0.0.1]:32969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqwY-000753-Ky for submit@debbugs.gnu.org; Sat, 02 Jan 2021 19:08:22 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:52142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqwX-00074v-Ay for 45070-done@debbugs.gnu.org; Sat, 02 Jan 2021 19:08:21 -0500 Received: (qmail 29036 invoked by uid 1009); 3 Jan 2021 01:08:19 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/26035. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.017115 secs); 03 Jan 2021 00:08:19 -0000 Received: from unknown (HELO localhost) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 3 Jan 2021 01:08:19 +0100 Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Subject: Re: [PATCH] gnu: Add Rust 1.47. From: =?utf-8?q?Jakub_K=C4=85dzio=C5=82ka?= To: <45070-done@debbugs.gnu.org> Date: Sun, 03 Jan 2021 01:06:05 +0100 Message-Id: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45070-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thanks for the patches! I added some comments and pushed them. I also added the next version myself, so the latest Rust 1.49 is now available. Regards, Jakub K=C4=85dzio=C5=82ka From unknown Sun Jun 22 00:41:02 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 31 Jan 2021 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator