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 ms0.migadu.com with LMTPS id +IXVFQ4IzmAXEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:06:54 +0200 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 WOCIEQ4IzmCvdwAA1q6Kng (envelope-from ) for ; Sat, 19 Jun 2021 15:06:54 +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 967D02C54C for ; Sat, 19 Jun 2021 17:06:53 +0200 (CEST) Received: from localhost ([::1]:51066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYe-0008TI-Bu for larch@yhetil.org; Sat, 19 Jun 2021 11:06:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007ie-Fw for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007qU-8a for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXs-0005do-3o for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 03/36] packages: Define this-package-input and this-package-native-input. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512121379 (code B ref 49025); Sat, 19 Jun 2021 15:06:04 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:21 +0000 Received: from localhost ([127.0.0.1]:60336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005Xb-MN for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWz-0005VK-Ec for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401358o5; Sat, 19 Jun 2021 17:05:08 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:25 +0200 Message-Id: <20210619150458.12057-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115108; bh=ktlZPKOFCiKBCSKOml0XVUAO70kiPtFkDzCU75II8EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rV9Gk406TswbgmJMdujKRQJwUKSXETPvEQR+ZmHlTG7YiOEGb7uug2Nw+DV6WLJTY 6uKz4fE5uld4ZmtS+6Kc3ohw0XYPr5/7XudeHRnzSHf0mLincDpPAX5Hoz/dgH7jGQ fITtsf69IYXrNxXUBzmOI7lIgCYoum7G6gfkES3tys8ih+NUA2sbJYYpnpN7Iu/coq oOQdx+lNHFIuTYEgyf92aNI4tYHy+BzPVFM6COdK1Voz0A2M5gyfGtFrKXRq43Veye hTVAqd7cdWgHDtzmdcfSbcKHHa3frm5QaSZYkJT3t0b1g++48VLYzKvZFISpgYOqXq 8vSZBrmaideYA== 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=1624115213; 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=ktlZPKOFCiKBCSKOml0XVUAO70kiPtFkDzCU75II8EQ=; b=FC6E9qWyk2/iDHF+qmf4YxnTNqd0RO/Y4mcP7vJGFUaN0CSCx/Uf5u8C5IkgONG9mehXR2 GA+Qb7sGjIaLBd9gRQlEfhaVzbJiZq+egIxG4n/TzUuS5VMSXLiu1jl5aFHSVOEWniIhYz jtZzV/EsEnDZlEHCZTiI3c5qWvvAg5dxh4Ut1+KosFbvtJ1Cf++794F9EOl905RBmj11F2 o7KqN377CW/Sen/bJwON7dOuWDhO6QMxbFTNuhdCOUqR4MEIJgJsX9PYBs2ZEKwK58OVtg Quwvrq1kxQozoePGYwgM1E4RczDuACXVgde1VWXfB40HbsaJ1uEUdkwAjEMdIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115213; a=rsa-sha256; cv=none; b=gtP+LcEg0oR+FNCwZpKAVF2UyOHp9W6TvhRYg5JwippgC2Qd2Mm/w9cTXMQRQx4ebHcIn/ VvlIkFI4vrTbGhcAEG2C4jfTT50j1bNSdDY8C6X5eR8jJmxqWDgEKjQPWE4aMSh+63v311 Jtr/Ancav2KRc5aDuWcbTOg0uzqUJQjcF5sZfjbtgj6fkDWqpZiOaTiJfEgih2Mt6hK/gD VoAwRorXWSozTTKteah6on/Ee8rjbRSUh3aCBJpvDC96tlh/2FZH+J2w9i+NWOCiTrDeYh 8qi3lnU3mgBV5gOrv4B6q9S2lnRAPxaALekwXUq2WzxHeQ2CYx7PzyuExhjPqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=rV9Gk406; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=rV9Gk406; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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: 967D02C54C X-Spam-Score: -0.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: BbPZ8Zo85yCu These macros are intended to be used in build phases. More precisely, (assoc-ref %build-inputs "input") can be replaced by #$(this-package-input "input") or #+(this-package-native-input "native-input") as appropriate. * guix/packages.scm (package-input, package-native-input): New (unexported) procedures. (this-package-input, this-package-native-input): New macros. --- guix/packages.scm | 29 +++++++++++++++++++++++++++++ tests/packages.scm | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index a66dbea1b7..80c8bbebf0 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -108,6 +108,9 @@ deprecated-package package-field-location + this-package-input + this-package-native-input + package-direct-sources package-transitive-sources package-direct-inputs @@ -513,6 +516,32 @@ object." #f))) (_ #f))) +(define (package-input package name) + "Return the package input NAME of PACKAGE--i.e., an input +from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not +considered. If this input does not exist, return #f instead." + (and=> (or (assoc-ref (package-inputs package) name) + (assoc-ref (package-propagated-inputs package) name)) + car)) + +(define (package-native-input package name) + "Return the native package input NAME of PACKAGE--i.e., an input +from the ‘native-inputs’ field. If this native input does not exist, +return #f instead." + (and=> (assoc-ref (package-native-inputs package) name) + car)) + +(define-syntax-rule (this-package-input name) + "Return the input NAME of the package being defined--i.e., an input +from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not +considered. If this input does not exist, return #f instead." + (package-input this-package name)) + +(define-syntax-rule (this-package-native-input name) + "Return the native package input NAME of the package being defined--i.e., +an input from the ‘native-inputs’ field. If this native input does not +exist, return #f instead." + (package-native-input this-package name)) ;; Error conditions. diff --git a/tests/packages.scm b/tests/packages.scm index 47d10af5bc..91ec38e4cc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1851,6 +1852,39 @@ (package-location (specification->package "guile@2")) (specification->location "guile@2")) +(test-eq "this-package-input, exists" + hello + (package-arguments + (dummy-package "a" + (inputs `(("hello" ,hello))) + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-input, exists in propagated-inputs" + hello + (package-arguments + (dummy-package "a" + (propagated-inputs `(("hello" ,hello))) + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-input, does not exist" + #f + (package-arguments + (dummy-package "a" + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-native-input, exists" + hello + (package-arguments + (dummy-package "a" + (native-inputs `(("hello" ,hello))) + (arguments (this-package-native-input "hello"))))) + +(test-eq "this-package-native-input, does not exists" + #f + (package-arguments + (dummy-package "a" + (arguments (this-package-native-input "hello"))))) + (test-end "packages") ;;; Local Variables: -- 2.32.0