From patchwork Fri Nov 23 17:47:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 290 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 5900316851; Fri, 23 Nov 2018 17:48:23 +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,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 B78D81684E for ; Fri, 23 Nov 2018 17:48:22 +0000 (GMT) Received: from localhost ([::1]:53748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQFYz-0006XM-9g for patchwork@mira.cbaines.net; Fri, 23 Nov 2018 12:48:21 -0500 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 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 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 X-Provags-ID: V03:K1:drdKkyDgzmPVQAHtx5v1cNucgLkB7cfs2MvGmL5ScXGu+ovciEU i90b2irK5RhyA6zMOPmuWSk+UJjNB7adNf9fxcKibHy8ZD7hxCOJ3lxwUvfiw9B/3ATiU+a Ehj6VHH4ZuB9m69ON6od19BvuX4kGGjZgzosnvllUeOTK3M2+0md1ZzJp0S+TGrUkIrLoeg 2bk3s+l+eQ5fhFw6laeaw== 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-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: , Cc: 33465@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 bootstrapping. * 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 inputs. --- 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 © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 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 PATCHES 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-bootstrap) + (package-native-inputs base-rust))))))) (define-public mrustc (let ((rustc-version "1.19.0")) -- 2.19.2