GNU bug report logs - #45070
[PATCH] gnu: Add Rust 1.47.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Matthew Kraai <kraai <at> ftbfs.org>
Subject: bug#45070: closed (Re: [PATCH] gnu: Add Rust 1.47.)
Date: Sun, 03 Jan 2021 00:09:02 +0000

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

Your bug report

#45070: [PATCH] gnu: Add Rust 1.47.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 45070 <at> debbugs.gnu.org.

-- 
45070: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45070
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: <45070-done <at> debbugs.gnu.org>
Subject: Re: [PATCH] gnu: Add Rust 1.47.
Date: Sun, 03 Jan 2021 01:06:05 +0100

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ądziołka

[Message part 3 (message/rfc822, inline)]

From: Matthew Kraai <kraai <at> ftbfs.org>
To: guix-patches <at> gnu.org
Cc: Matthew Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: Add Rust 1.47.
Date: Sun,  6 Dec 2020 04:57:53 -0800

* 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 <ivanppetkov <at> gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois <at> gmx.com>
+;;; Copyright © 2020 Matthew Kraai <kraai <at> ftbfs.org>
 ;;;
 ;;; 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\"")))
+                   ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
+                   (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

Previous Next

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