From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQFYk-0006Vt-6f for guix-patches@gnu.org; Fri, 23 Nov 2018 12:48:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQFYg-0003AV-EQ for guix-patches@gnu.org; Fri, 23 Nov 2018 12:48:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:40240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gQFYg-00039R-1d for guix-patches@gnu.org; Fri, 23 Nov 2018 12:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gQFYf-0003zM-RU for guix-patches@gnu.org; Fri, 23 Nov 2018 12:48:01 -0500 Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-Message-ID: References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> From: Pierre Langlois In-reply-to: Date: Fri, 23 Nov 2018 17:47:33 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: Julien Lepiller , Marius Bakke Cc: 33465@debbugs.gnu.org --=-=-= Content-Type: text/plain Pierre Langlois writes: > Whoops, ignore that patch, it doesn't do what I wanted it to do. The > point was to skip the tests *only* for temporary packages used for > bootstrapping the final one. But here it's disabled the tests all the > time, we don't want that... my bad! I'll another look when I have time. Right, attached is what I meant to do. Thanks! Pierre --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-rust-Do-not-run-tests-when-building-for-bootstra.patch Content-Transfer-Encoding: quoted-printable >From 326a4761b03c50481d44d5b485954d823006bbb8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 23 Nov 2018 11:58:06 +0000 Subject: [PATCH v2] gnu: rust: Do not run tests when building for bootstrap= ping. * gnu/packages/rust.scm (rust-bootstrapped-package): Create a temporary rust-bootstrap package that inherits from base-rust and removes the check phase. Then use it for the cargo-bootsrap and rustc-bootstrap native input= s. --- gnu/packages/rust.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad079..7d416836aa 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2017 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Danny Milosavljevic +;;; Copyright =C2=A9 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,15 +84,26 @@ (define* (rust-bootstrapped-package base-rust version checksum #:key (patches '())) "Bootstrap rust VERSION with source checksum CHECKSUM patched with PATCH= ES using BASE-RUST." - (package - (inherit base-rust) - (version version) - (source - (rust-source version checksum #:patches patches)) - (native-inputs - (alist-replace "cargo-bootstrap" (list base-rust "cargo") - (alist-replace "rustc-bootstrap" (list base-rust) - (package-native-inputs base-rust)))))) + ;; Tests take a long time to run, as they do not run in parallel for + ;; stability reasons. Disable them when building the rust used for + ;; bootstrapping. + (let ((rust-bootstrap + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check)))))))) + (package + (inherit base-rust) + (version version) + (source + (rust-source version checksum #:patches patches)) + (native-inputs + (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") + (alist-replace "rustc-bootstrap" (list rust-bootstra= p) + (package-native-inputs base-rust)))))= )) =20 (define-public mrustc (let ((rustc-version "1.19.0")) --=20 2.19.2 --=-=-=--