From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Nov 2018 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33465@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154289513223970 (code B ref -1); Thu, 22 Nov 2018 13:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Nov 2018 13:58:52 +0000 Received: from localhost ([127.0.0.1]:40668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpVL-0006EX-P5 for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpVJ-0006EK-Fd for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpVD-00077l-4Y for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:44 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpVD-00077c-0o for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpVB-0000tA-L1 for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpV6-00073r-LD for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:41 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:60847) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpV5-000711-UP for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:36 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 96EEAD7E for ; Thu, 22 Nov 2018 08:58:32 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 22 Nov 2018 08:58:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=iDmXT68s6Cchf1LsrInEa+6eZq gasjbMCPZtX6vHqCk=; b=rsjDXB9dEpA/YTCpeKHWb3Gf6shM4EzgwEfRO6CtWq zwePip+dOzXNXiYIOuD7e22GaUL8Nvm6NsVwXYRqbzGLvGb6onYO/99dmrhAwRU3 YDF6QNHCq9g6ErjqQyegkEndCAg2NzCwV5J6QD/LMA5krlXU7Kj74osOcaupgbTx DLvGrk3jc7GlfOPeB79haEVIra0AWv0ZMhyzMzomDYcV1PgnkkjHiZKZbuO0AIe5 ons+SU35X4hfdX7W2czfw72DXakYvi155j2BULWIvoXCOhYYl6obh/AUj83LtnQu 4aNBlM4XK8bgaG8phz2U7sWE4l5FF7MGvzW7pl3cMN7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=iDmXT68s6Cchf1Lsr InEa+6eZqgasjbMCPZtX6vHqCk=; b=ssghhe0mnH2S/z046YiP45A0Nu7WWMjhX wx5NEC6cFfBIu8FWcOYmeWx1IEtnS5EcsPtJqth8M/UH5l1zCryJwSpkreipeVEh flZsONHAnMPdaQ48YdzMY2LpU0QkXmHFmIcH6xTp8DjOfsCBTmyA7iE2BRiij3yX 25UQobfyY4gqNcF26oIQBHMEYvYLXLj1oJb3naW9Bk/PzeEjD1OxqiOHJgC61/57 5uL0qu+KSIF0UaCR1xEgFjlUvOFeAZqhsrijHsbitmMotdnWieKqzKNQbjxFG3uD yAI33SBT8tOO+dF3qD2pMOxKon5PTsp1q0F/5I6vJDMLLYBI6EG8g== X-ME-Sender: X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 98684102DE for ; Thu, 22 Nov 2018 08:58:31 -0500 (EST) From: Marius Bakke Date: Thu, 22 Nov 2018 14:58:30 +0100 Message-Id: <20181122135830.18927-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) * gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. (rust-1.20)[arguments]: Disable Cargo tests that require git. (rust-1.26)[arguments]: Likewise. --- Notes: Guix, The Rust toolchain is very expensive to build and needs less volatility. So far I have only built up to Rust 1.23 with this patch. I suggest applying this on 'core-updates', and giving Rust in 'master' a git-2.19.1 input to the previous substitutes are valid again. WDYT? gnu/packages/rust.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad07..ae41a7dd3 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) #:use-module (gnu packages) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) @@ -387,7 +386,6 @@ test = { path = \"../libtest\" } ("cmake" ,cmake) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests - ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -446,6 +444,13 @@ safety and thread safety guarantees.") ;; i686-linux. (substitute* "src/tools/cargo/tests/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; These tests pull in a dependency on "git", which changes + ;; too frequently take part in the Rust toolchain. + (substitute* "src/tools/cargo/tests/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test ;; https://github.com/rust-lang/rust/issues/47863 @@ -678,6 +683,12 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; i686-linux. (substitute* "src/tools/cargo/tests/testsuite/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; Avoid dependency on "git". + (substitute* "src/tools/cargo/tests/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ -- 2.19.1 From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Nov 2018 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33465@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154289562724819 (code B ref -1); Thu, 22 Nov 2018 14:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Nov 2018 14:07:07 +0000 Received: from localhost ([127.0.0.1]:40677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpdK-0006SE-VJ for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:07:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpdJ-0006Rl-Fj for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:07:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpdC-0005hZ-G0 for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:06:59 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpdC-0005hG-CR for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:06:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpdB-0003dx-5P for guix-patches@gnu.org; Thu, 22 Nov 2018 09:06:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpd7-0005Wv-6p for guix-patches@gnu.org; Thu, 22 Nov 2018 09:06:57 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:36822) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpd6-0005SW-Ue for guix-patches@gnu.org; Thu, 22 Nov 2018 09:06:53 -0500 Received: from webmail.lepiller.eu (static-176-182-42-79.ncc.abo.bbox.fr [176.182.42.79]) by lepiller.eu (OpenSMTPD) with ESMTPSA id ace3508a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Thu, 22 Nov 2018 14:04:30 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 22 Nov 2018 15:06:48 +0100 From: Julien Lepiller In-Reply-To: <20181122135830.18927-1-mbakke@fastmail.com> References: <20181122135830.18927-1-mbakke@fastmail.com> Message-ID: <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> X-Sender: julien@lepiller.eu User-Agent: Roundcube Webmail/1.3.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Le 2018-11-22 14:58, Marius Bakke a écrit : > * gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. > (rust-1.20)[arguments]: Disable Cargo tests that require git. > (rust-1.26)[arguments]: Likewise. > --- > > Notes: > Guix, > > The Rust toolchain is very expensive to build and needs less > volatility. > > So far I have only built up to Rust 1.23 with this patch. I > suggest > applying this on 'core-updates', and giving Rust in 'master' a > git-2.19.1 input to the previous substitutes are valid again. > > WDYT? Hi, I don't really know how our rust packages are built, but I wonder if they have more than the bare minimum optional features for our purposes (apart from 1.24 used by icecat and the latest version, we probably don't need to build everything)? Maybe it's worth investigating if that can speed up the build of the whole chain. It seems we're two versions behind current rust too. Is anyone working on packaging them? > > gnu/packages/rust.scm | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index a56faad07..ae41a7dd3 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -41,7 +41,6 @@ > #:use-module (gnu packages python) > #:use-module (gnu packages ssh) > #:use-module (gnu packages tls) > - #:use-module (gnu packages version-control) > #:use-module (gnu packages) > #:use-module (guix build-system cargo) > #:use-module (guix build-system gnu) > @@ -387,7 +386,6 @@ test = { path = \"../libtest\" } > ("cmake" ,cmake) > ("flex" ,flex) ; For the tests > ("gdb" ,gdb) ; For the tests > - ("git" ,git) > ("procps" ,procps) ; For the tests > ("python-2" ,python-2) > ("rustc-bootstrap" ,mrustc) > @@ -446,6 +444,13 @@ safety and thread safety guarantees.") > ;; i686-linux. > (substitute* "src/tools/cargo/tests/test.rs" > (("fn cargo_test_env") "#[ignore]\nfn > cargo_test_env")) > + > + ;; These tests pull in a dependency on "git", which > changes > + ;; too frequently take part in the Rust toolchain. > + (substitute* "src/tools/cargo/tests/new.rs" > + (("fn author_prefers_cargo") "#[ignore]\nfn > author_prefers_cargo") > + (("fn finds_author_git") "#[ignore]\nfn > finds_author_git") > + (("fn finds_local_author_git") "#[ignore]\nfn > finds_local_author_git")) > #t)) > (add-after 'patch-cargo-tests > 'ignore-glibc-2.27-incompatible-test > ;; https://github.com/rust-lang/rust/issues/47863 > @@ -678,6 +683,12 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" > "\" > ;; i686-linux. > (substitute* > "src/tools/cargo/tests/testsuite/test.rs" > (("fn cargo_test_env") "#[ignore]\nfn > cargo_test_env")) > + > + ;; Avoid dependency on "git". > + (substitute* "src/tools/cargo/tests/new.rs" > + (("fn author_prefers_cargo") "#[ignore]\nfn > author_prefers_cargo") > + (("fn finds_author_git") "#[ignore]\nfn > finds_author_git") > + (("fn finds_local_author_git") "#[ignore]\nfn > finds_local_author_git")) > #t)) > (add-after 'patch-cargo-tests > 'disable-cargo-test-for-nightly-channel > (lambda* _ From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Nov 2018 12:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller , Marius Bakke Cc: 33465@debbugs.gnu.org Received: via spool by 33465-submit@debbugs.gnu.org id=B33465.154297470432195 (code B ref 33465); Fri, 23 Nov 2018 12:06:02 +0000 Received: (at 33465) by debbugs.gnu.org; 23 Nov 2018 12:05:04 +0000 Received: from localhost ([127.0.0.1]:43067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQACl-0008N8-1y for submit@debbugs.gnu.org; Fri, 23 Nov 2018 07:05:04 -0500 Received: from mout.gmx.net ([212.227.17.20]:37281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQACi-0008MY-Br for 33465@debbugs.gnu.org; Fri, 23 Nov 2018 07:05:01 -0500 Received: from labiere ([2.99.199.150]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LufbI-1fQKGn1ofo-00zrjc; Fri, 23 Nov 2018 13:04:49 +0100 References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> User-agent: mu4e 1.1.0; emacs 26.1 From: Pierre Langlois In-reply-to: <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> Date: Fri, 23 Nov 2018 12:04:47 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:FIKoxzOSKN9NBuQuSfpCTsmf4U1oAQnehliqUHnjZnFxEMpkHCd mGcPjQNUrZSMSc0V7VPBdTtpYBkJWw2PxAUc5TSYfYhSWZ7GjLU2Fy5O+pR083TX/SYR5+7 dQnef6ZuQgxyX2+It5WyFPaxPWrAmqmX9/76MRSG/OjAnkUVh6hd87Es2ygX7SHn73bX3Dn 1xxUfsRgeW3re/Tjb0bdg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:gZXHtC4PhpI=:0+6Ife5gY1vuHGGdcPUiw3 UaG46WZBu7DipKwulNJfUd08QeW7lVlK4cLwoSj4cNtuOsP9bm8P1+GIRItMlXKfXt2q+dRXF KSg0gzY+3p2Hkm/UxhotEm/hAw+UTSFU6ZMj+gXGsftEPNJKB+KpT5xUVjQrxzSFkE6s1GM/D du763Ar6IKb4cQvcrE7KTlhJq8N3QR/3asv3x9TKrYs2faRc5U/d7uanHMPZeZ5896LhmDUWs yCwHvXG2EMHGGiyJZtlf2Abxk+TiRCtSdnZ4AgS8YcyK8ndgVoiEwB/ql0jGmVZSiplF+tp6e lLURW4OP7iCIo1cm286EcKN3oPRwB+c7QeeOZm1NLALaS/Pu65/cA1pK9iO2Oq4uq90h1eBDc POQ93l9GuD/3ky0cYVQ29wZls3bP1qoJbyzatPFQhFM46nKvslstBchxQe0dD3GkRRMUdARrZ 2TI7osoRfVBJ1rgr1YNU/I51aeyPLQ2oxoWis+XN5+StmvqWpO61CbjnE0uTDaxhi3LK6tUHR ZGHl1j+gwwwmNfMKrUo1bkKvG0rWWJ1UA5Nsvy/RT7yaPCXO2ia2nXgVL4QG1HVsxoujyPIba xpIh749UrITrubiynSxSe/0lV6J/7HaUtx2bWsn8fdZw+wneF0PebvCbSmJII5u1WbPJ0m+eB P0Ycb71vog4fmFVjRLkTM4KvoX4BQdMD8B3H4NMMvowNU2cst8qoipl66DqqtCOu+YMbaq+wE fX2BVRerXmpXBwOPYR5sradlWDb/MEMjRy3Ci1VaVsWV7vnUfickiie9Fsy4tfElQggwDx0xe gOoWwhJ6Vs01f/bG/KUapre/W5lzKTRCW48B18tVvFJIrPZvc7nHkKlm8OIxO5z7jYDL1qTFj Lg4jao7zFeQrcw+kDIGvq7FoAjL8SwB0mB9E0k4YQ= X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Julien and Marius, Julien Lepiller writes: > Le 2018-11-22 14:58, Marius Bakke a =C3=A9crit: >> * gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. >> (rust-1.20)[arguments]: Disable Cargo tests that require git. >> (rust-1.26)[arguments]: Likewise. >> --- >> >> Notes: >> Guix, >> >> The Rust toolchain is very expensive to build and needs less >> volatility. >> >> So far I have only built up to Rust 1.23 with this patch. I >> suggest >> applying this on 'core-updates', and giving Rust in 'master' a >> git-2.19.1 input to the previous substitutes are valid again. >> >> WDYT? > > Hi, I don't really know how our rust packages are built, but I wonder > if they have more than the bare minimum optional features for our > purposes (apart from 1.24 used by icecat and the latest version, we > probably don't need to build everything)? Maybe it's worth > investigating if that can speed up the build of the whole chain. One thing I've been wondering about would be to remove the 'check phase when building a rust that will be used for bootstrapping only. Since the tests are not ran in parallel, they take a huge amount of time. See attached patched, I'm testing it now. It's currently building rust@1.23. WDYT? 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 46233c5f6ced0ad5e535a848527ad35309535b97 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 23 Nov 2018 11:58:06 +0000 Subject: [PATCH] gnu: rust: Do not run tests when building for bootstrappin= g. * gnu/packages/rust.scm (rust-bootstrapped-package): Add 'arguments' field that removes the check phase. --- gnu/packages/rust.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad079..40160de05c 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. ;;; @@ -91,7 +92,15 @@ (native-inputs (alist-replace "cargo-bootstrap" (list base-rust "cargo") (alist-replace "rustc-bootstrap" (list base-rust) - (package-native-inputs base-rust)))))) + (package-native-inputs base-rust)))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + ;; Tests take a long time to run, as they do not run in parallel + ;; for stability reasons. Disable them when building rust for + ;; bootstrapping. + (delete 'check))))))) =20 (define-public mrustc (let ((rustc-version "1.19.0")) --=20 2.19.1 --=-=-=-- From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Nov 2018 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller , Marius Bakke Cc: 33465@debbugs.gnu.org Received: via spool by 33465-submit@debbugs.gnu.org id=B33465.154299037232590 (code B ref 33465); Fri, 23 Nov 2018 16:27:02 +0000 Received: (at 33465) by debbugs.gnu.org; 23 Nov 2018 16:26:12 +0000 Received: from localhost ([127.0.0.1]:44467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQEHS-0008TY-AC for submit@debbugs.gnu.org; Fri, 23 Nov 2018 11:26:11 -0500 Received: from mout.gmx.net ([212.227.15.19]:43283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQEHQ-0008TL-GJ for 33465@debbugs.gnu.org; Fri, 23 Nov 2018 11:26:09 -0500 Received: from labiere ([2.99.199.150]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MYfre-1fw1yx2HHW-00VTuw; Fri, 23 Nov 2018 17:25:57 +0100 References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> User-agent: mu4e 1.1.0; emacs 26.1 From: Pierre Langlois In-reply-to: Date: Fri, 23 Nov 2018 16:25:56 +0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:IQwBbd9oR8VIfLNZarCh3ZcSetR1jGLC59L8RliMbAdnGf0GLVz i0b6UnyTVoh1XKsnmYzpjsqELXnOw6eqKr1C7XAzCTYOrOsO35a0l0O044KwILy0s2G02PD Qkynn9M1S4A8X2x60WEsyu8q9O/Kr3UmymgCYG7rfArPewi0bdJXmNYK4U5EPOV5Y9Ix92D GOf4zfa+bXvvO6KAmrzQg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:P+ujnzroEGA=:VIUe8pSer+BlelQiCz3xGX Tmy3Gwv6ZNhdaTAASdcOmilK8cnK0vrgiiQUegyjTA9ziYG7eCLTnqYZePZcgsnhyEDuf3MkU ZeLnKlXiVHVWwZ1Xd7p4glG2mcGssh+yRzucfZGdgdREIkRtX0hwOLdlAoPQngkA1RGO0IDrk XNiMh4aFQplJbFq4+id1crD6p4BV5eHGJAN3TNKZdcVin5vtE6uyUvRQ/4EepSKTB+b5Cy/u8 wTQ9AoPYnmrbxxU0wKOZrqhBghWr6RTizY+uqJcgpb9C3YQgZOwj7aZm/xMU4lZ1J02F+xFD8 d4nD5jUQkdk8ZrwIlGwi4TYK7al2z++CVEDAnXwSlj4M67ofKSu4VZ2/D8BuOQ0IjoxJ3Ib2q Hm3y7tlKxzJoGDi/ySw5EGbEfBXIOL+j3ifNVPg2umpJE1yn4QVFy1pwv5go0RoMQ2c35Zjf3 UuglWEu4PnB/qUinhKrrYxTD5nKmTEyzEpgfoUQDLoYp7j7dFjFmje/ysNRfQ7nrvP92410Uw 9zt5OLKU+uBH/ROwY8Toahh/BTCKV6w1ldh6InSqmQpdlnImLMmAB4Wsce7Wyk/YYCyLkunYJ Y5LMeZXCEIYtFF6moVRxyBpNKYzENf8xDV6NahY7c5LEg2jZTOzSwNg350Ck7xGPjObxvStS2 UYrNK8cMvgnAfDkcwAjki70jt6L9PdCUzvmbYRUwOWV97D3bTDJ4gJbpaZJz16p7gIRu7RffX GLopHdISdlS1luDq1jfdUHXdu8LEmrU3IydBMYaQx6wzLsOK7R7SXhsU8dGIl1AtrQyt6fzaw PUmTtsrxsmFvoz0S5V0p0O5EiU+MdsQTBnw+h94ms9euKC/H7EN8MKym8E4rt2X9fmvTXAFaf ux3HIIkMh9/p6PAyHYWQAsULkCtZV2boepLUSWk+P5D/GCMSaRVUIQ/xhlF6nV X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > From 46233c5f6ced0ad5e535a848527ad35309535b97 Mon Sep 17 00:00:00 2001 > From: Pierre Langlois > Date: Fri, 23 Nov 2018 11:58:06 +0000 > Subject: [PATCH] gnu: rust: Do not run tests when building for bootstrapping. > > * gnu/packages/rust.scm (rust-bootstrapped-package): Add 'arguments' field > that removes the check phase. 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. Thanks, Pierre From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Nov 2018 17:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller , Marius Bakke Cc: 33465@debbugs.gnu.org Received: via spool by 33465-submit@debbugs.gnu.org id=B33465.154299526915310 (code B ref 33465); Fri, 23 Nov 2018 17:48:01 +0000 Received: (at 33465) by debbugs.gnu.org; 23 Nov 2018 17:47:49 +0000 Received: from localhost ([127.0.0.1]:44498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQFYS-0003ys-VL for submit@debbugs.gnu.org; Fri, 23 Nov 2018 12:47:49 -0500 Received: from mout.gmx.net ([212.227.15.15]:48131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQFYQ-0003ye-Pt for 33465@debbugs.gnu.org; Fri, 23 Nov 2018 12:47:47 -0500 Received: from labiere ([2.99.199.150]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MEnjW-1gBLIq1LGE-00Fz9p; Fri, 23 Nov 2018 18:47:34 +0100 References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> User-agent: mu4e 1.1.0; emacs 26.1 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="=-=-=" X-Provags-ID: V03:K1:drdKkyDgzmPVQAHtx5v1cNucgLkB7cfs2MvGmL5ScXGu+ovciEU i90b2irK5RhyA6zMOPmuWSk+UJjNB7adNf9fxcKibHy8ZD7hxCOJ3lxwUvfiw9B/3ATiU+a Ehj6VHH4ZuB9m69ON6od19BvuX4kGGjZgzosnvllUeOTK3M2+0md1ZzJp0S+TGrUkIrLoeg 2bk3s+l+eQ5fhFw6laeaw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:uf9+ZuSjvk0=:iLzfT9t3rWQy56S319gabK k26rYj1jP7RvNbqvq9wny8n8HnOu74TeCVxZUxrDIDXTF43KT5W8cY+3a9AITVX94SbIHwgJp +8jf3A80/D+DIOZE4aFpvhzDiHo0rqakRIZbAkU/kIie5cuyP/H1Im4AgZK6LOrpD+ebZ40JQ Bpvx6BfCPus7wZxu+cA1vmS3Wqpq4/LAvGU0/CzWmRbkBs5d+uBn6hwzqu09EBNTwUeaaKYCh f2i0FiVST75jpWnjlONYdyDOIEhv5wXucmTlCgselJoy4lMP+8SPE0llDACLtGOLVftKaBx+5 8NaYbMuyY+vDs9DBuEUkT4pzMFUm955vf2wzAqvndGdznWTnFQYccgC156MQlHbApdsuEUXW2 x91CaNza69aHuoV+K9jLke2bMUB5t/rSftKcDRAILsBDTMHsgp7+gHXjMxVx2Ptw2WERsf+6v puKFLPu0tz2ZIcGiJjv95JWHbCL5a1S+atS/VzBnIBmsfhvfEOSQqNsbR4YyfmKO8/dXBHnPM cVNSCpgJyZmuthBOt5iarbEC+vpgKgNEn4lRiBn0enbPDrc702+EKiaiG2vBQpv5hsSi/v40H W0Sy0gYXPR+KjfM0U2vjlQheLEKUUbAVzjgzYJX6tQ37eHWkBH1Xqi8U3kqjoJihtT0uIY+0s Yzmbqu9fPurVbHgXH+/i98RjfiHBCqTio003pETA3mNw/XSfczpp4hmamafDzrNCSVUGHvoCg LgU4PqBrUUaDnvbhqJOoDLZl2DQ3ZILcHpt1ZXwghB9Ypz4RWxi9Wgw6z3+ibXoVwzSsEbDKZ XBUUGPC5FgA/kx7QXvO9fq6UtiatBsJFaXWRozc67NcJ9ReZr4OHyCgzjrDs7QyPnY7IOrl39 41X7RT7S4ltaFzFwCegPjicnhVMt3qlzjUbYvXmtQ= X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= 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 --=-=-=-- From unknown Mon Sep 08 10:54:18 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Marius Bakke Subject: bug#33465: closed (Re: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'.) Message-ID: References: <87h8g7mgcz.fsf@fastmail.com> <20181122135830.18927-1-mbakke@fastmail.com> X-Gnu-PR-Message: they-closed 33465 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 33465@debbugs.gnu.org Date: Sat, 24 Nov 2018 01:10:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1543021803-22811-1" This is a multi-part message in MIME format... ------------=_1543021803-22811-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #33465: [PATCH] gnu: rust: Don't depend on 'git'. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 33465@debbugs.gnu.org. --=20 33465: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D33465 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1543021803-22811-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 33465-done) by debbugs.gnu.org; 24 Nov 2018 01:09:15 +0000 Received: from localhost ([127.0.0.1]:44675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQMRb-0005sw-Ug for submit@debbugs.gnu.org; Fri, 23 Nov 2018 20:09:14 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQMRY-0005rQ-0I for 33465-done@debbugs.gnu.org; Fri, 23 Nov 2018 20:09:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id DD08621F60; Fri, 23 Nov 2018 20:09:02 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 23 Nov 2018 20:09:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm1; bh=CJQq+78kbe63R9/OJEDG27DTvQ ZECUCNGqUo3lwCwpA=; b=V16AI1XWBMIQNFTxgI0zRwx4zzwQ9Y9ROhcUAxIXiY XGbZgOcmIrXpyxvrHkdWTo8EuweP70b6psMPEsbxa3loDbsyXvxBcWl1LOAhCSvV RdCTSz6yekpke8rjqIvvqX5mIhcdZD6ksfSbWZa6MjQdNokN9bOOXTtB/aewTAML UYdtTBlqMYIs2bpybnyLScpeXkVsLFRPREz7xKxfEiBrxiKKG+8PDPxWrZ79nn/I UxKEueFcR0J7cQqm3ZS5mOgTfKbWLSCnlInXWxerm+wX52iSxP88o0pFDrJamH6h u0l30Hhz7gZDhQ3NwL0+D1UTmEdK35VRMqmMq2q0OWnw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=CJQq+7 8kbe63R9/OJEDG27DTvQZECUCNGqUo3lwCwpA=; b=tcxDnvmlBKIt6cUWYUCtZM o1y7qG0Lpzns2VR5JNO1U+Wc414nJ6WuyepxRP0rjyPTccVhjT8YdLCORm4W6uO5 2dYK9IJ79bibYw14u1VYY0q3q/kIA+Zbv4TDsdBEN0AQoTmgxi/eRtlZWGR+fcTe EnNnfUqzbhK8Jya32a9NNWUQDTNgCFcaU27t4UBJtlztaTr9jYE0mispPpgU5rsr 4vAjDItq8XN3Iivy6DV5WeP6aJucWBz+rIejMJ7tmblw5UPhihvmGkrrSV4YgDmb QEbVqLpcEMj/wiYnAcI5P35VYH8nReU1EoxyD9Bsnu3bbq53FnzWsZfPJ4qEZAIQ == X-ME-Sender: X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id C3741102A0; Fri, 23 Nov 2018 20:09:01 -0500 (EST) From: Marius Bakke To: Pierre Langlois , Julien Lepiller Subject: Re: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. In-Reply-To: References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> User-Agent: Notmuch/0.28 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Sat, 24 Nov 2018 02:09:00 +0100 Message-ID: <87h8g7mgcz.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33465-done Cc: 33465-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Pierre Langlois writes: > 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. Hello! I don't have a strong opinion for or against disabling tests in the Rust bootstrap toolchain. But with Git removed, most (all?) of Rusts dependencies are packages that do not change very frequently (i.e. only on the 'staging' and 'core-updates' branches), so maybe it's not as urgent? Regardless, I've pushed the original patch to the 'core-updates' branch. Could you submit the other patch to a separate issue or to guix-devel? TIA! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlv4pKwACgkQoqBt8qM6 VPoN8Af8DNUVdWLakkWokgj3h++7oqedVzreWSZ1sI8n+wZZEMKWSLrZP9TQfs4M 4646n/TPK4S5IysLw6p4wiow8Ro/IgW2Ga/yHzpByC5fo3isMxRSQksCs7zCQFzi 0SyWiaI+kM2ZbyFisD6MDzjwUhCeZeysdvGG/rZCAHfsa1+1AYGfTNjRR04gX7MU jSZIOVAKzr1bUvWMXeZadQSu9smny+jPrnaOeOGg37xyYrSO1WtGl35bu+Fbrj76 FYiludZ+J0r1IXO0TmDKGsTXGidy4VQMNnojGKxxzsRJU3xaXl9TGfPd/cIyEcfh nWhpS7XuIEkH3YOMvBc9wl8myAGUEg== =aVrT -----END PGP SIGNATURE----- --=-=-=-- ------------=_1543021803-22811-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Nov 2018 13:58:52 +0000 Received: from localhost ([127.0.0.1]:40668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpVL-0006EX-P5 for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPpVJ-0006EK-Fd for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpVD-00077l-4Y for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:44 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpVD-00077c-0o for submit@debbugs.gnu.org; Thu, 22 Nov 2018 08:58:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpVB-0000tA-L1 for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpV6-00073r-LD for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:41 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:60847) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpV5-000711-UP for guix-patches@gnu.org; Thu, 22 Nov 2018 08:58:36 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 96EEAD7E for ; Thu, 22 Nov 2018 08:58:32 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 22 Nov 2018 08:58:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=iDmXT68s6Cchf1LsrInEa+6eZq gasjbMCPZtX6vHqCk=; b=rsjDXB9dEpA/YTCpeKHWb3Gf6shM4EzgwEfRO6CtWq zwePip+dOzXNXiYIOuD7e22GaUL8Nvm6NsVwXYRqbzGLvGb6onYO/99dmrhAwRU3 YDF6QNHCq9g6ErjqQyegkEndCAg2NzCwV5J6QD/LMA5krlXU7Kj74osOcaupgbTx DLvGrk3jc7GlfOPeB79haEVIra0AWv0ZMhyzMzomDYcV1PgnkkjHiZKZbuO0AIe5 ons+SU35X4hfdX7W2czfw72DXakYvi155j2BULWIvoXCOhYYl6obh/AUj83LtnQu 4aNBlM4XK8bgaG8phz2U7sWE4l5FF7MGvzW7pl3cMN7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=iDmXT68s6Cchf1Lsr InEa+6eZqgasjbMCPZtX6vHqCk=; b=ssghhe0mnH2S/z046YiP45A0Nu7WWMjhX wx5NEC6cFfBIu8FWcOYmeWx1IEtnS5EcsPtJqth8M/UH5l1zCryJwSpkreipeVEh flZsONHAnMPdaQ48YdzMY2LpU0QkXmHFmIcH6xTp8DjOfsCBTmyA7iE2BRiij3yX 25UQobfyY4gqNcF26oIQBHMEYvYLXLj1oJb3naW9Bk/PzeEjD1OxqiOHJgC61/57 5uL0qu+KSIF0UaCR1xEgFjlUvOFeAZqhsrijHsbitmMotdnWieKqzKNQbjxFG3uD yAI33SBT8tOO+dF3qD2pMOxKon5PTsp1q0F/5I6vJDMLLYBI6EG8g== X-ME-Sender: X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 98684102DE for ; Thu, 22 Nov 2018 08:58:31 -0500 (EST) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH] gnu: rust: Don't depend on 'git'. Date: Thu, 22 Nov 2018 14:58:30 +0100 Message-Id: <20181122135830.18927-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) * gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. (rust-1.20)[arguments]: Disable Cargo tests that require git. (rust-1.26)[arguments]: Likewise. --- Notes: Guix, The Rust toolchain is very expensive to build and needs less volatility. So far I have only built up to Rust 1.23 with this patch. I suggest applying this on 'core-updates', and giving Rust in 'master' a git-2.19.1 input to the previous substitutes are valid again. WDYT? gnu/packages/rust.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad07..ae41a7dd3 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) #:use-module (gnu packages) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) @@ -387,7 +386,6 @@ test = { path = \"../libtest\" } ("cmake" ,cmake) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests - ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -446,6 +444,13 @@ safety and thread safety guarantees.") ;; i686-linux. (substitute* "src/tools/cargo/tests/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; These tests pull in a dependency on "git", which changes + ;; too frequently take part in the Rust toolchain. + (substitute* "src/tools/cargo/tests/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test ;; https://github.com/rust-lang/rust/issues/47863 @@ -678,6 +683,12 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; i686-linux. (substitute* "src/tools/cargo/tests/testsuite/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; Avoid dependency on "git". + (substitute* "src/tools/cargo/tests/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ -- 2.19.1 ------------=_1543021803-22811-1-- From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Nov 2018 21:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , Pierre Langlois Cc: Julien Lepiller , 33465-done@debbugs.gnu.org Received: via spool by 33465-done@debbugs.gnu.org id=D33465.154309593316818 (code D ref 33465); Sat, 24 Nov 2018 21:46:01 +0000 Received: (at 33465-done) by debbugs.gnu.org; 24 Nov 2018 21:45:33 +0000 Received: from localhost ([127.0.0.1]:45888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQfk5-0004NC-4D for submit@debbugs.gnu.org; Sat, 24 Nov 2018 16:45:33 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:37642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQfk3-0004N4-Iq for 33465-done@debbugs.gnu.org; Sat, 24 Nov 2018 16:45:32 -0500 Received: from localhost (77.116.197.89.wireless.dyn.drei.com [77.116.197.89]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 527C2336006B; Sat, 24 Nov 2018 22:45:27 +0100 (CET) Date: Sat, 24 Nov 2018 22:45:15 +0100 From: Danny Milosavljevic Message-ID: <20181124224515.416719ce@scratchpost.org> In-Reply-To: <87h8g7mgcz.fsf@fastmail.com> References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> <87h8g7mgcz.fsf@fastmail.com> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/phu43aB+sL+VaXKJE4x9CK8"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/phu43aB+sL+VaXKJE4x9CK8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, I'd prefer if the git parts were removed in a new phase "remove-git-tests" = and that phase removed (ha) in the newest rust - otherwise we never test rust g= it integration. Then the substitution wouldn't need to be duplicated either. --Sig_/phu43aB+sL+VaXKJE4x9CK8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlv5xmsACgkQ5xo1VCww uqWnhAf+LtpUhkDEWkQP93DCENpr4UcehNYIlC3BbmGntwh7dlNzvtDGOdysW+f0 RQ8kbg++pTFMbAy/VGOq3f5dKIeP8y8UvHZc7PbdFeNvin2a5/1C0sG0iUR/BuqT VeQfY+oGIdv2nyLoBFInmmBOluR/DAXpR9fhGCwWlQSUxGhbDiPsIFJeFg4Lgw1n 6Ld48TH1QVQ0zP/cGheEr4Pd9MD/P6kEQv62bNPM8HjThZ7ZYPXgE2BLteHEHOuw NLOO3MNxkaK99QHwwBrqDx3Zqx1W249XEDlZLUjntTY5CUeZgYR2QJFlR5xe1Am3 dGpXq9rHfYv18hcZjb6Qv7oFxIK0JQ== =olhV -----END PGP SIGNATURE----- --Sig_/phu43aB+sL+VaXKJE4x9CK8-- From unknown Mon Sep 08 10:54:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Nov 2018 11:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Cc: Julien Lepiller , Marius Bakke , Pierre Langlois , 33465-done@debbugs.gnu.org Received: via spool by 33465-done@debbugs.gnu.org id=D33465.154314682429719 (code D ref 33465); Sun, 25 Nov 2018 11:54:01 +0000 Received: (at 33465-done) by debbugs.gnu.org; 25 Nov 2018 11:53:44 +0000 Received: from localhost ([127.0.0.1]:46091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQsyu-0007jG-Gq for submit@debbugs.gnu.org; Sun, 25 Nov 2018 06:53:44 -0500 Received: from mout.gmx.net ([212.227.15.19]:44523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQsys-0007j3-3V for 33465-done@debbugs.gnu.org; Sun, 25 Nov 2018 06:53:43 -0500 Received: from skye ([2.99.199.150]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MLOMM-1gQL0t25Ss-000Zp1; Sun, 25 Nov 2018 12:53:29 +0100 References: <20181122135830.18927-1-mbakke@fastmail.com> <1c2849407fb4914810f3c367fc16b6cf@lepiller.eu> <87h8g7mgcz.fsf@fastmail.com> <20181124224515.416719ce@scratchpost.org> User-agent: mu4e 1.1.0; emacs 26.1 From: Pierre Langlois In-reply-to: <20181124224515.416719ce@scratchpost.org> Date: Sun, 25 Nov 2018 11:53:00 +0000 Message-ID: <87pnutv0f7.fsf@gmx.com> MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:EDhxWMK22NAPU9HSWUHYPRrSlxntuYb+OWBvG86oGgGBif2th6n 8eRCq3A4isfTpyMS2DBiQ9F7/jb0c8hQKfS1IRijXKVd9w4s6GgyKMDj7HYL+RyFGZLMaPW yzMYiDVSRIhDw2L1CVaMU0W1o2QBvtjigJBOQ8QTXV/Fae7ETDHJemBMuMGMbh3yEWB6eCM 9S/3pbl+phj66SzYlicMw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:aIRraNKE8xw=:l9ZFifGMmC0S50vJUGLN0L RXoy+JyZOz+I/cSLTBrBDKO4znAjg1LYfaAr42womBJetTQiQAUZu8JqlRlkPPgnCO0TJQSY9 LGZO3lqtFkT6lOXNc0fGshFYK8FCuR/SWjwDTlMsBtQipCj7vWVXfa644XLehiHlaVwe7g8oF 2fFXyHhLBpnY5jhxtTHkBTk7OqiqbNtYQG9Nj58VgdJMoAQtVgAu8XkAbL/46IJag/PZHac6v uQH6sIB6Et41GkbPDbAK38l8yVgggkyHMqiZIccWKtqP5vLWDn35nByE2NepTU9reFJ+MdLgw iWJ1xOvVsR6dMfIE5rKd1mJ8Hmj1SdDH5o1KhpQu+7QziYvKq+bYz/6eD5aLbhoX2al6KBrfF VPjSp0/mRS8oSMyHF6/Ph/OfuS7WtXpaiKSEsLF5fqg08DEYTbzoSYKhRRE+F4nzG1Qj137T6 FAuN4owBgi+LWa8KspMZ10TxCqU+2bH/icL84PbsWp+dJgJap7i6Z4ItrVCnu60JV4bi7jx25 oRfjGN1wNJ3Una6r2OFAPUEFpJ07y7pcc+Ns1nf3AjlhAYf6xiTGd+y0DGoZ/KPnEwrgA0NNn 7jSKf/vmgK0besCyJoyoYS2H1LpW4rin6p6Jzgvb56Ar0ETMhVaDXppaYDq4sGJtjuyqNS7b9 6t842Oqvl4mMVoE8DdvG6Jyu0YL+dG3JORB57hoN//ndtO23xsdcSEf6SBPdgBPsHDt1UnERN Qm0vzMdejC8WFWZ4CnG+XM9SoyPf8lKllvprEr2FoMt++Ujgpi3PuuTpCnBp4olAFA6xHvBJk h58g25F+xnJwW06ZzUEkwSQHWd7lMINdti9QAxxVZmB9OtHLHhQFSX2+I2kiuElYiRM3/Dt/J 1NATLd+SQbxeOkFVTNgOvwzkEO5WkDZO2r5/Ph+lk/SSepkby/+2fqEiCYbo/a X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Danny, Danny Milosavljevic writes: > Hi, > > I'd prefer if the git parts were removed in a new phase "remove-git-tests" and > that phase removed (ha) in the newest rust - otherwise we never test rust git > integration. > > Then the substitution wouldn't need to be duplicated either. Alternatively, if we go with removing tests althogether when building rust for bootstrapping, we can also remove non-essential native inputs such as git and gdb. And then we can keep all of them for the final rust. As with Marius, I don't have a strong opinion on this, I just thought I'd mention it as a possibility to speedup rust's build process. I can submit a patch in a separate ticket if you think it's a good idea. Thanks! Pierre