unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 40957@debbugs.gnu.org
Subject: [bug#40957] [PATCH 2/?] gnu: rust: Add 1.41
Date: Wed, 29 Apr 2020 18:02:18 +0200	[thread overview]
Message-ID: <20200429160218.15270-1-kuba@kadziolka.net> (raw)
In-Reply-To: <20200429094022.22294-1-kuba@kadziolka.net>

---
 gnu/packages/rust.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index a82bfa5912..78cfdfc97a 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1210,4 +1210,37 @@ move around."
                ;; "Remove painful test that is not pulling its weight"
                (delete 'remove-unsupported-tests)))))))))
 
+(define-public rust-1.41
+  (let ((base-rust
+         (rust-bootstrapped-package rust-1.40 "1.41.1"
+           "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q")))
+    (package
+      (inherit base-rust)
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:validate-runpath? _) #t)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             ;; The tests got moved.
+             (replace 'patch-command-exec-tests
+               ,(patch-command-exec-tests-phase
+                  "src/test/ui/command/command-exec.rs"))
+             (replace 'patch-command-uid-gid-test
+               (lambda _
+                 (substitute* "src/test/ui/command/command-uid-gid.rs"
+                   (("/bin/sh") (which "sh"))
+                   (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength"))
+                 #t))
+             ;; The test in question got fixed long ago, no need to chase it
+             ;; after renames.
+             (delete 'disable-cargo-test-for-nightly-channel)
+             ;; The patch-tests phase in rust-1.19 uses the fragile approach
+             ;; of inserting additional newlines instead of disabling the tidy
+             ;; check. Fixing this retroactively requires painful rebuilds.
+             (add-after 'patch-tests 'ignore-tidy-linelength
+               (lambda _
+                 (let ((port (open-file "src/libstd/process.rs" "a")))
+                   (display "// ignore-tidy-linelength\n" port))
+                 #t)))))))))
+
 (define-public rust rust-1.37)
-- 
2.26.2





  reply	other threads:[~2020-04-29 16:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29  9:40 [bug#40957] [PATCH 1/?] gnu: rust: Add 1.40 Jakub Kądziołka
2020-04-29 16:02 ` Jakub Kądziołka [this message]
2020-06-20 20:44 ` [bug#40957] [PATCH v2 1/2] gnu: llvm-9: Backport patches to fix miscompilations Jakub Kądziołka
2020-06-20 20:44 ` [bug#40957] [PATCH v2 2/2] gnu: rust: Bootstrap up to rustc 1.44 Jakub Kądziołka
2020-07-01  6:14 ` [bug#40957] [PATCH 1/?] gnu: rust: Add 1.40 John Soo
2020-07-02 23:41   ` bug#40957: " Jakub Kądziołka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200429160218.15270-1-kuba@kadziolka.net \
    --to=kuba@kadziolka.net \
    --cc=40957@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).