From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0NhpAZ0Sq18gOgAA0tVLHw (envelope-from ) for ; Tue, 10 Nov 2020 22:22:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8B3XOJwSq1/CVAAAbx9fmQ (envelope-from ) for ; Tue, 10 Nov 2020 22:22:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6A0519403CA for ; Tue, 10 Nov 2020 22:22:20 +0000 (UTC) Received: from localhost ([::1]:47208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcc1q-0000Ap-96 for larch@yhetil.org; Tue, 10 Nov 2020 17:22:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcc1a-0000A6-KY for guix-patches@gnu.org; Tue, 10 Nov 2020 17:22:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcc1a-0005ZB-BM for guix-patches@gnu.org; Tue, 10 Nov 2020 17:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcc1a-0001hp-6p for guix-patches@gnu.org; Tue, 10 Nov 2020 17:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38408] [PATCH v16 6/6] import: crate: Parameterized importing of dev dependencies. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Nov 2020 22:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Martin Becze Cc: 38408@debbugs.gnu.org Received: via spool by 38408-submit@debbugs.gnu.org id=B38408.16050469026528 (code B ref 38408); Tue, 10 Nov 2020 22:22:02 +0000 Received: (at 38408) by debbugs.gnu.org; 10 Nov 2020 22:21:42 +0000 Received: from localhost ([127.0.0.1]:39263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcc1F-0001hE-Nw for submit@debbugs.gnu.org; Tue, 10 Nov 2020 17:21:42 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:58762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcc1D-0001h6-Rg for 38408@debbugs.gnu.org; Tue, 10 Nov 2020 17:21:40 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CW2QW2jjFz1rtMh; Tue, 10 Nov 2020 23:21:39 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CW2QW2Sqsz1r56P; Tue, 10 Nov 2020 23:21:39 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id JlzZXKT85NA4; Tue, 10 Nov 2020 23:21:38 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-61-127.dynamic.mnet-online.de [188.174.61.127]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 10 Nov 2020 23:21:38 +0100 (CET) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 59C3160154; Tue, 10 Nov 2020 23:22:12 +0100 (CET) From: Hartmut Goebel References: Organization: crazy-compilers.com Message-ID: <40e4832b-7a88-4a3a-712b-7bc0c56fa448@crazy-compilers.com> Date: Tue, 10 Nov 2020 23:21:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: Ag/OPLUHADYW Am 10.11.20 um 22:39 schrieb Hartmut Goebel: > @@ -255,9 +258,12 @@ latest version of CRATE-NAME." > (let* ((dependencies (crate-version-dependencies version*)) > (dep-crates dev-dep-crates (partition normal-dependency? dependencies)) > (cargo-inputs (sort-map-dependencies dep-crates)) > - (cargo-development-inputs '())) > + (cargo-development-inputs (if include-dev-deps? > + (sort-map-dependencies dev-dep-crates) > + '()))) > (values > - (make-crate-sexp #:name crate-name > + (make-crate-sexp #:build? include-dev-deps? > + #:name crate-name I'm curious about this: The value of "include-dev-deps?" determines whether the the package will be have #:skip-build set #t or #f? If this is intended, it should be described in the doc-string and in the changelog. > --- a/guix/scripts/import/crate.scm > +++ b/guix/scripts/import/crate.scm > @@ -96,13 +96,13 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) > > (if (assoc-ref opts 'recursive) > (crate-recursive-import name #:version version) > - (let ((sexp (crate->guix-package name #:version version))) > + (let ((sexp (crate->guix-package name #:version version #:include-dev-deps? #t))) > (unless sexp > (leave (G_ "failed to download meta-data for package '~a'~%") > (if version > (string-append name "@" version) > name))) > - sexp))) > + (list sexp)))) This last line change looks like an error. Is it intended? -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible |