From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpVe-00016X-SY for guix-patches@gnu.org; Thu, 22 Nov 2018 08:59:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPpVX-0007vA-Ck for guix-patches@gnu.org; Thu, 22 Nov 2018 08:59:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPpVW-0007rh-ML for guix-patches@gnu.org; Thu, 22 Nov 2018 08:59:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gPpVW-0006Ew-MP for guix-patches@gnu.org; Thu, 22 Nov 2018 08:59:02 -0500 Subject: [bug#33465] [PATCH] gnu: rust: Don't depend on 'git'. Resent-Message-ID: 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 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> 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: 33465@debbugs.gnu.org * 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