From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mNetBaccWGB/RQAA0tVLHw (envelope-from ) for ; Mon, 22 Mar 2021 04:27:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uHWPAaccWGCodwAA1q6Kng (envelope-from ) for ; Mon, 22 Mar 2021 04:27:19 +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 7113310BC3 for ; Mon, 22 Mar 2021 05:27:18 +0100 (CET) Received: from localhost ([::1]:44484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOC9t-0003t1-7O for larch@yhetil.org; Mon, 22 Mar 2021 00:27:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOC3q-0007GH-AK for guix-patches@gnu.org; Mon, 22 Mar 2021 00:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOC3q-00011q-0U for guix-patches@gnu.org; Mon, 22 Mar 2021 00:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOC3p-0005tb-T6 for guix-patches@gnu.org; Mon, 22 Mar 2021 00:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47310] [PATCH 1/4] import: utils: Refactor maybe-inputs and add maybe-propagated-inputs. References: <87eeg7vn3d.fsf@gmail.com> In-Reply-To: <87eeg7vn3d.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Mar 2021 04:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47310@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 47310-submit@debbugs.gnu.org id=B47310.161638684022577 (code B ref 47310); Mon, 22 Mar 2021 04:21:01 +0000 Received: (at 47310) by debbugs.gnu.org; 22 Mar 2021 04:20:40 +0000 Received: from localhost ([127.0.0.1]:55822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOC3U-0005s5-54 for submit@debbugs.gnu.org; Mon, 22 Mar 2021 00:20:40 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:35822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOC3S-0005rq-S5 for 47310@debbugs.gnu.org; Mon, 22 Mar 2021 00:20:39 -0400 Received: by mail-qv1-f53.google.com with SMTP id x27so8066318qvd.2 for <47310@debbugs.gnu.org>; Sun, 21 Mar 2021 21:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/72utIhoWxFa/Ss4qr/M4ZbG5RnS99CklZw/lswtn24=; b=bewJRSipJEr1KhqibE0SLotkbmZPCz6xA8pEUxVnOuokfSYeX6U5HJ5BODDLbRYuyr 3cXDxc0KdpqzMCp+hsJ2rlQqemY+STvagnnfCL2IUwoNSbt5x/XH0HnWlmgQfytGvAy+ JGSPjWmiU3XJnMNOhVU2s8igG/M+/DAZgcEhi4Tf+6xU0ptSpocnnLJHwuz/AHOx8Ovl uZNhLhHZMbfqaAzSR7miLl1yh7oHDKdYw77LsKVLCYihGtBUWkSSuFmDoEvpYGX0ExSK UlSbVrjSagmJ2EwsJsxgrPmy1Io/Dx2wNKwSgOziU1bCqBY4eEncPFzRwisgrb6PM4sl OJkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/72utIhoWxFa/Ss4qr/M4ZbG5RnS99CklZw/lswtn24=; b=Kthtoy67O8GRjVP5JVdvXHcxC/Ru4uNaCJZKmWao6j6A1vw7D2dbmD5Xc9IP9Zg7L1 WhTTsGCW8UMnowDk5rwlWLw8stRjGBWqdPCYWR6CPVCF3qVx0IFt7EzBoOvcUiXAarlP IaTVsiDTvk7K6b6YmaOCgmqJuSxIFFF23dc6DcllUB1W2iViUn9ZhX+PTPWdmVzwb7n9 Ni7R8i+gfDFwUbxbGrXOAx+D073atDPh2/+z7iY4PN3nVgbTzqFOkBgLgKK/tnal4R56 E7pXu4fCHDNecurdBhFMUZtaLWtQJ5Fir+IGmugRyArXOkhNLa0o9yI9tCbZ4AcR4BxC Xaew== X-Gm-Message-State: AOAM5318s1iv9XxTJQ3PPs9MY8F/fDyiiF3PX5qxCehFkGinmmTAmGPi Ass9tMmz42PmNeKDp8zLtN+e7aaD3rA= X-Google-Smtp-Source: ABdhPJzrCdlCuDS4q1TbjuUy+v+pZcxP0rUKyQSNEMEPS4rPnbTC6wKNEmfcyT0A/RwioWJ2VCgD5Q== X-Received: by 2002:a0c:f092:: with SMTP id g18mr19944409qvk.11.1616386833044; Sun, 21 Mar 2021 21:20:33 -0700 (PDT) Received: from localhost.localdomain (dsl-10-134-34.b2b2c.ca. [72.10.134.34]) by smtp.gmail.com with ESMTPSA id z8sm8340478qtn.12.2021.03.21.21.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 21:20:32 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 22 Mar 2021 00:20:19 -0400 Message-Id: <20210322042022.17385-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=yes Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616387238; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/72utIhoWxFa/Ss4qr/M4ZbG5RnS99CklZw/lswtn24=; b=N6S3caOgiAtV08CKxZzpJIHAeqNlE2CCOwtIlKeAm18/0qaC1OUcFJak/J+6vZ+1MC3rbI iQTBTHjkSQ1CcOJ7ta6q81YV6TJWas1c8C2ms/PH5T6pL+OUOlH9FjfaTf7j0VrlI1hSyB OQXXG0z/AzlYLB3g5NH0gF1PXDAgWN3b8kDeObQFkRFwqiZfIXRRPnxQRlY7r9sOAfIY9A 0v/EYszeCUoDfHJMcY5fskTK/THnWSDx9qmt41K/ptZbicwlfJ5sxaDyKZ60jiGojoOSYm /F9lx/wIgL1iPeHJabTnpjxnSgDZhPcADTNSMv/OoqvXkAqd8ZMLkltIVWrayg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616387238; a=rsa-sha256; cv=none; b=Rhu6qembzmWzLRIVUbkUdKcwQHbWJpOxG818ct1/iXm2jzkNWH20eopSXVrdHCnpO4b3H9 5dVTU9NZTrkXtrhs9Vbye1KR8JTgIMKd1t2LLUG/Ov4adNXU/An1ScP7INeqnqaH0sADr+ QEgcM3GvyM5YYSCz7g3r8R3SCkz5DT1ALXJ5ECkcNmvwrP89H4D7cPrWJxvHBbDjWURCDQ tZmAq1oW0ETmQf8+fwCokeUE/sdhjlSUtf+gqZdFztYsoaOAFtFQx7i6pdzdUjG+0198Gw tOFhkjSrPGWIbcs6Q/gIEUwALum42uFZM3me2U3aukyRHj1xXDoq0AlLa8w+0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=bewJRSip; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=bewJRSip; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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-Migadu-Queue-Id: 7113310BC3 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: HcyZ7G9RlC6Y * guix/import/utils.scm (maybe-inputs)[type]: New argument. Update docstring. The argument is used to derive the input field name to use. (maybe-native-inputs): Adjust to use the above. (maybe-propagated-inputs): New procedure. --- guix/import/utils.scm | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 64d1385164..e55258e306 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ package-names->package-inputs maybe-inputs maybe-native-inputs + maybe-propagated-inputs package->definition spdx-string->license @@ -246,23 +248,29 @@ use in an 'inputs' field of a package definition." (input (make-input input #f))) names)) -(define* (maybe-inputs package-names #:optional (output #f)) +(define* (maybe-inputs package-names #:optional (output #f) + #:key (type #f)) "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a -package definition." - (match (package-names->package-inputs package-names output) - (() - '()) - ((package-inputs ...) - `((inputs (,'quasiquote ,package-inputs)))))) +package definition. TYPE can be used to specify the type of the inputs; +either the 'native or 'propagated symbols are accepted. Left unspecified, the +snippet generated is for regular inputs." + (let ((field-name (match type + ('native 'native-inputs) + ('propagated 'propagated-inputs) + (_ 'inputs)))) + (match (package-names->package-inputs package-names output) + (() + '()) + ((package-inputs ...) + `((,field-name (,'quasiquote ,package-inputs))))))) (define* (maybe-native-inputs package-names #:optional (output #f)) - "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a -package definition." - (match (package-names->package-inputs package-names output) - (() - '()) - ((package-inputs ...) - `((native-inputs (,'quasiquote ,package-inputs)))))) + "Same as MAYBE-INPUTS, but for native inputs." + (maybe-inputs package-names output #:type 'native)) + +(define* (maybe-propagated-inputs package-names #:optional (output #f)) + "Same as MAYBE-INPUTS, but for propagated inputs." + (maybe-inputs package-names output #:type 'propagated)) (define* (package->definition guix-package #:optional append-version?/string) "If APPEND-VERSION?/STRING is #t, append the package's major+minor -- 2.30.1