all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: 32822@debbugs.gnu.org
Subject: [bug#32822] [PATCH 1/4] gnu: rust: Hide "ar" entry from rust@1.21.0.
Date: Mon, 24 Sep 2018 17:01:31 +0200	[thread overview]
Message-ID: <20180924150134.26799-1-dannym@scratchpost.org> (raw)
In-Reply-To: <20180924144747.22338-1-dannym@scratchpost.org>

* gnu/packages/rust.scm (rust-1.21)[arguments]<#:phases>[remove-ar]: New
phase.
---
 gnu/packages/rust.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 40633854a..a1ad6534e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -636,8 +636,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
                    #t))))))))))
 
 (define-public rust-1.21
-  (rust-bootstrapped-package rust-1.20 "1.21.0"
-                             "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"))
+  (let ((base-rust (rust-bootstrapped-package rust-1.20 "1.21.0"
+                    "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")))
+    (package
+      (inherit base-rust)
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (add-after 'configure 'remove-ar
+               (lambda* (#:key inputs #:allow-other-keys)
+                 ;; Remove because toml complains about "unknown field".
+                 (substitute* "config.toml"
+                  (("^ar =.*") "\n"))
+                 #t)))))))))
 
 (define-public rust-1.22
   (rust-bootstrapped-package rust-1.21 "1.22.1"

  reply	other threads:[~2018-09-24 15:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-24 14:47 [bug#32822] [PATCH 0/4] Finish rust bootstrapping Danny Milosavljevic
2018-09-24 15:01 ` Danny Milosavljevic [this message]
2018-09-24 15:01   ` [bug#32822] [PATCH 2/4] gnu: rust@1.23.0: Bootstrap by rust@1.22.0 Danny Milosavljevic
2018-09-24 15:01   ` [bug#32822] [PATCH 3/4] gnu: rust@1.23.0: Use rust-bootstrapped-package Danny Milosavljevic
2018-09-24 15:01   ` [bug#32822] [PATCH 4/4] gnu: rust: Remove binary bootstrapper Danny Milosavljevic
2018-09-24 19:38 ` [bug#32822] [PATCH 0/4] Finish rust bootstrapping Ludovic Courtès
2018-09-25  8:01   ` Danny Milosavljevic
2018-09-25 15:31     ` Ludovic Courtès

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

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

  git send-email \
    --in-reply-to=20180924150134.26799-1-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=32822@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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.