unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#35115] [PATCH] gnu: rust: Update to 1.33.0
@ 2019-04-03  2:33 Ivan Petkov
       [not found] ` <handler.35115.B.15542588143904.ack@debbugs.gnu.org>
  2019-04-11 10:54 ` bug#35115: " Ludovic Courtès
  0 siblings, 2 replies; 3+ messages in thread
From: Ivan Petkov @ 2019-04-03  2:33 UTC (permalink / raw)
  To: 35115

* gnu/packages/rust.scm (rust): Rename to...
(rust-1.32): ...this.
(rust): New variable.
---
 gnu/packages/rust.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 63426a12fc..fb045afad4 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -928,7 +928,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
                    (("```rust") "```rust,no_run"))
                  #t)))))))))
 
-(define-public rust
+(define-public rust-1.32
   (let ((base-rust
          (rust-bootstrapped-package rust-1.31 "1.32.0"
           "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"
@@ -980,3 +980,28 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
              ;; Remove no longer relevant steps
              (delete 'remove-flaky-test)
              (delete 'patch-aarch64-test))))))))
+
+(define-public rust-1.33
+  (let ((base-rust
+         (rust-bootstrapped-package rust-1.32 "1.33.0"
+                                    "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"
+                                    #:patches '())))
+    (package
+      (inherit base-rust)
+      (inputs
+       ;; Upgrade to jemalloc@5.1.0
+       (alist-replace "jemalloc" (list jemalloc)
+                      (package-inputs base-rust)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (delete 'ignore-cargo-package-tests)
+             (add-after 'configure 'configure-test-threads
+               ;; Several rustc and cargo tests will fail if run on one core
+               ;; https://github.com/rust-lang/rust/issues/59122
+               ;; https://github.com/rust-lang/cargo/issues/6746
+               ;; https://github.com/rust-lang/rust/issues/58907
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (setenv "RUST_TEST_THREADS" "2")
+                 #t)))))))))
-- 
2.21.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#35115] [PATCH] gnu: rust: Update to 1.33.0
       [not found] ` <handler.35115.B.15542588143904.ack@debbugs.gnu.org>
@ 2019-04-03  5:17   ` Ivan Petkov
  0 siblings, 0 replies; 3+ messages in thread
From: Ivan Petkov @ 2019-04-03  5:17 UTC (permalink / raw)
  To: 35115


Realized I forgot to rename the `rust-1.33` variable to `rust` when
I sent out the patch, but something that should be tweaked before pushing…

—Ivan

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#35115: [PATCH] gnu: rust: Update to 1.33.0
  2019-04-03  2:33 [bug#35115] [PATCH] gnu: rust: Update to 1.33.0 Ivan Petkov
       [not found] ` <handler.35115.B.15542588143904.ack@debbugs.gnu.org>
@ 2019-04-11 10:54 ` Ludovic Courtès
  1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2019-04-11 10:54 UTC (permalink / raw)
  To: Ivan Petkov; +Cc: 35115-done

Hi Ivan,

Ivan Petkov <ivanppetkov@gmail.com> skribis:

> * gnu/packages/rust.scm (rust): Rename to...
> (rust-1.32): ...this.
> (rust): New variable.

I added the new ‘rust’ variable and applied.

Thank you!

Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-04-11 10:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-03  2:33 [bug#35115] [PATCH] gnu: rust: Update to 1.33.0 Ivan Petkov
     [not found] ` <handler.35115.B.15542588143904.ack@debbugs.gnu.org>
2019-04-03  5:17   ` Ivan Petkov
2019-04-11 10:54 ` bug#35115: " Ludovic Courtès

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).