From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 24 05:39:52 2020 Received: (at submit) by debbugs.gnu.org; 24 Jan 2020 10:39:52 +0000 Received: from localhost ([127.0.0.1]:53502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuwNU-0003Sq-5c for submit@debbugs.gnu.org; Fri, 24 Jan 2020 05:39:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:42094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuwNS-0003Si-D6 for submit@debbugs.gnu.org; Fri, 24 Jan 2020 05:39:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48241) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuwNR-0007PB-8G for guix-patches@gnu.org; Fri, 24 Jan 2020 05:39:50 -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,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuwNP-0006WR-2p for guix-patches@gnu.org; Fri, 24 Jan 2020 05:39:49 -0500 Received: from flashner.co.il ([178.62.234.194]:42858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iuwNO-0004wm-TA for guix-patches@gnu.org; Fri, 24 Jan 2020 05:39:47 -0500 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id F3654401E4; Fri, 24 Jan 2020 10:39:14 +0000 (UTC) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs. Date: Fri, 24 Jan 2020 12:38:43 +0200 Message-Id: <20200124103843.29807-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.62.234.194 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner 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: -0.7 (/) * guix/import/crate.scm (crate->guix-package): Add definition for 'dev-dependency?' and 'build-dependency?'. Adjust dep-crates to take normal- and build- dependencies. --- guix/import/crate.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 57823c3639..0fece81c55 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016 David Craven ;;; Copyright =C2=A9 2019, 2020 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2019 Martin Becze +;;; Copyright =C2=A9 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,7 +87,7 @@ crate-dependency? json->crate-dependency (id crate-dependency-id "crate_id") ;string - (kind crate-dependency-kind "kind" ;'normal | 'dev + (kind crate-dependency-kind "kind" ;'normal | 'dev | 'bui= ld string->symbol) (requirement crate-dependency-requirement "req")) ;string =20 @@ -197,6 +198,12 @@ latest version of CRATE-NAME." (define (normal-dependency? dependency) (eq? (crate-dependency-kind dependency) 'normal)) =20 + (define (dev-dependency? dependency) + (eq? (crate-dependency-kind dependency) 'dev)) + + (define (build-dependency? dependency) + (eq? (crate-dependency-kind dependency) 'build)) + (define crate (lookup-crate crate-name)) =20 @@ -212,8 +219,9 @@ latest version of CRATE-NAME." =20 (and crate version* (let* ((dependencies (crate-version-dependencies version*)) - (dep-crates (filter normal-dependency? dependencies)) - (dev-dep-crates (remove normal-dependency? dependencies)) + (dep-crates (append (filter normal-dependency? depende= ncies) + (filter build-dependency? dependen= cies))) + (dev-dep-crates (filter dev-dependency? dependencies)) (cargo-inputs (sort (map crate-dependency-id dep-crates) string-ci) id 1iz7Rz-00074Q-Kk for submit@debbugs.gnu.org; Tue, 04 Feb 2020 18:17:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iz7Rx-00074B-Mp for 39261@debbugs.gnu.org; Tue, 04 Feb 2020 18:17:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iz7Rr-0003qe-JR; Tue, 04 Feb 2020 18:17:39 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35612 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iz7Rp-0002yr-JM; Tue, 04 Feb 2020 18:17:38 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Efraim Flashner Subject: Re: [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs. References: <20200124103843.29807-1-efraim@flashner.co.il> Date: Wed, 05 Feb 2020 00:17:36 +0100 In-Reply-To: <20200124103843.29807-1-efraim@flashner.co.il> (Efraim Flashner's message of "Fri, 24 Jan 2020 12:38:43 +0200") Message-ID: <87imkmt01b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39261 Cc: 39261@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 (-) Hello! Nitpick: for the subject line, I=E2=80=99d write: import: crate: Move build dependencies to cargo-inputs. Efraim Flashner skribis: > * guix/import/crate.scm (crate->guix-package): Add definition for > 'dev-dependency?' and 'build-dependency?'. Adjust dep-crates to take > normal- and build- dependencies. [...] > + (define (dev-dependency? dependency) > + (eq? (crate-dependency-kind dependency) 'dev)) Nitpick2: I=E2=80=99d recommend =E2=80=98development-dependency?=E2=80=99 a= s per the style guidelines. :-) Anyhow, LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 05 02:14:40 2020 Received: (at 39261) by debbugs.gnu.org; 5 Feb 2020 07:14:40 +0000 Received: from localhost ([127.0.0.1]:45063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izEtU-0002O6-IY for submit@debbugs.gnu.org; Wed, 05 Feb 2020 02:14:40 -0500 Received: from flashner.co.il ([178.62.234.194]:56006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izEtT-0002Nr-9g for 39261@debbugs.gnu.org; Wed, 05 Feb 2020 02:14:39 -0500 Received: from [127.0.0.1] (unknown [37.26.146.230]) by flashner.co.il (Postfix) with ESMTPSA id 4345640045; Wed, 5 Feb 2020 07:14:33 +0000 (UTC) Date: Wed, 05 Feb 2020 07:14:04 +0000 From: Efraim Flashner To: =?ISO-8859-1?Q?Ludovic_Court=E8s?= Subject: Re: [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs. User-Agent: K-9 Mail for Android In-Reply-To: <87imkmt01b.fsf@gnu.org> References: <20200124103843.29807-1-efraim@flashner.co.il> <87imkmt01b.fsf@gnu.org> Message-ID: <6D8DAA60-B757-463F-A7A8-7D3022974A1F@flashner.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39261 Cc: 39261@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.0 (-) I'm actually going to let this one ride until we review the importer patche= s=2E Then if it still makes sense we can apply this one=2E On February 4, 2020 11:17:36 PM UTC, "Ludovic Court=C3=A8s" wrote: >Hello! > >Nitpick: for the subject line, I=E2=80=99d write: > > import: crate: Move build dependencies to cargo-inputs=2E > >Efraim Flashner skribis: > >> * guix/import/crate=2Escm (crate->guix-package): Add definition for >> 'dev-dependency?' and 'build-dependency?'=2E Adjust dep-crates to take >> normal- and build- dependencies=2E > >[=2E=2E=2E] > >> + (define (dev-dependency? dependency) >> + (eq? (crate-dependency-kind dependency) 'dev)) > >Nitpick2: I=E2=80=99d recommend =E2=80=98development-dependency?=E2=80=99= as per the style >guidelines=2E :-) > >Anyhow, LGTM! > >Thanks, >Ludo=E2=80=99=2E --=20 Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E