From patchwork Thu Nov 22 13:58:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 275 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7933516844; Thu, 22 Nov 2018 13:59:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 059DC16842 for ; Thu, 22 Nov 2018 13:59:20 +0000 (GMT) Received: from localhost ([::1]:46748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpVm-000185-MP for patchwork@mira.cbaines.net; Thu, 22 Nov 2018 08:59:18 -0500 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 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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* _