From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48348) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuwNe-0007gl-Vv for guix-patches@gnu.org; Fri, 24 Jan 2020 05:40:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuwNd-0006uR-U6 for guix-patches@gnu.org; Fri, 24 Jan 2020 05:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuwNd-0006uA-RO for guix-patches@gnu.org; Fri, 24 Jan 2020 05:40:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iuwNd-0003TQ-OG for guix-patches@gnu.org; Fri, 24 Jan 2020 05:40:01 -0500 Subject: [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs. Resent-Message-ID: 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 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 From: Efraim Flashner Date: Fri, 24 Jan 2020 12:38:43 +0200 Message-Id: <20200124103843.29807-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: 39261@debbugs.gnu.org Cc: Efraim Flashner * 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