From patchwork Fri Jan 24 10:38:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 19964 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 9F58717B3E; Fri, 24 Jan 2020 10:40:09 +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=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5AE70179EE for ; Fri, 24 Jan 2020 10:40:09 +0000 (GMT) Received: from localhost ([::1]:40338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuwNk-0007jF-Tm for patchwork@mira.cbaines.net; Fri, 24 Jan 2020 05:40:08 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2020 10:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39261@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157986239213324 (code B ref -1); Fri, 24 Jan 2020 10:40:01 +0000 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 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 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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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: 209.51.188.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 * 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 © 2016 David Craven ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Martin Becze +;;; Copyright © 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 | 'build string->symbol) (requirement crate-dependency-requirement "req")) ;string @@ -197,6 +198,12 @@ latest version of CRATE-NAME." (define (normal-dependency? dependency) (eq? (crate-dependency-kind dependency) 'normal)) + (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)) @@ -212,8 +219,9 @@ latest version of CRATE-NAME." (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? dependencies) + (filter build-dependency? dependencies))) + (dev-dep-crates (filter dev-dependency? dependencies)) (cargo-inputs (sort (map crate-dependency-id dep-crates) string-ci