From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4SXu-0004Be-Ri for guix-patches@gnu.org; Mon, 24 Sep 2018 11:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4SN8-0002Sj-U6 for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4SN8-0002Sd-Q5 for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g4SN8-0007mX-Mx for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:02 -0400 Subject: [bug#32822] [PATCH 1/4] gnu: rust: Hide "ar" entry from rust@1.21.0. Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 24 Sep 2018 17:01:31 +0200 Message-Id: <20180924150134.26799-1-dannym@scratchpost.org> In-Reply-To: <20180924144747.22338-1-dannym@scratchpost.org> References: <20180924144747.22338-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32822@debbugs.gnu.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"