From patchwork Wed Jul 21 01:00:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 31539 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 1911727BC78; Wed, 21 Jul 2021 02:02:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 88AD027BC82 for ; Wed, 21 Jul 2021 02:02:21 +0100 (BST) Received: from localhost ([::1]:39284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m60cu-0007sk-JV for patchwork@mira.cbaines.net; Tue, 20 Jul 2021 21:02:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60cd-0007QC-CW for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m60cd-0007hp-58 for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m60cd-00009B-3s for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH 3/9] gnu: Query membership in =?utf-8?b?4oCYc3Vw?= =?utf-8?b?cG9ydGVkLXN5c3RlbXPigJk=?= list with Nix identifier Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 01:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.1626829292434 (code B ref 49672); Wed, 21 Jul 2021 01:02:03 +0000 Received: (at 49672) by debbugs.gnu.org; 21 Jul 2021 01:01:32 +0000 Received: from localhost ([127.0.0.1]:35753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60c7-00006v-PA for submit@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:31 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:46640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60c4-00006F-JZ for 49672@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:29 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id C565B998 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1626829282; x=1628643683; bh=SAJtHvbCdwm8Ckgjtm0X+08E70CEVR79+6Q /3J1R6Pc=; b=MfnJNYk0Fy1pn6POnnE1wZ5stnWhEvZ2qtp13VTQ2h9eV5kZN0z EyIMks/sH5ME20pi6cB5Qw8iG21LpaqTKUAkMJQd7La3OZpk4pMksl+/QYcCmq3h 3O7DNXuLxqmFI/1q3vLkFdOxsU8/UdRQqlKMFwUsTP4untkr2XaiYysFqGC92Ud5 KNZxH1jH7bSyFTGatiMXosI9qNR+d5OrMysFltBwlZuBfj/uxEbf/PzggYi8dCRg VhCAxrNyf4PRuDofn+das2S4u77NryQyOR/dl4RVstOnWzz7DrWdkDUDUOSARCn4 XwegdQLgvgQOL98scdGDAJ+iUvUVh+sYV7SJNWF0Idyls5KZlrsk+4Ysxef6FCsJ dnVKhY0QVOsGzu3sLuMiS8FacaTJVdhc1D2YNLncy/xG/xJz3AuXwg/U5WdWhOsx p+HaAydgc/TZQr7YKD9WayaAdeqartwI1cKq5ONyx2QJFgOiFhvVYStbrp1uJZpv 1CwUuNmtTbV0hXFwCGQag8e2BQbM5HoP08WqT1H8a+zd+QG4bW4pbMCBFXgbr3ir BgitvTGrVhqa67jOyCnq0kUnONJbDJubvRcZk0d7pe0YuDvbNsTS4D3Bzsi3Nxw6 znrLPr22Zg4RAd/gIoGfIfC97TnjpN/Oet05AzlfTlwhvXZKRHFLncNc= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id chUqjvn8JpyW for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:22 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id 35BD5D3 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:20 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 5E3CD323; Wed, 21 Jul 2021 03:01:20 +0200 (CEST) Date: Tue, 20 Jul 2021 22:00:37 -0300 Message-Id: <20210721010043.632012-3-bauermann@kolabnow.com> In-Reply-To: <20210721010043.632012-1-bauermann@kolabnow.com> References: <20210721010043.632012-1-bauermann@kolabnow.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches Packages’ ‘supported-systems’ list contains Nix system identifiers, while ‘%current-target-system’ contains a GNU triplet. We need to use ‘current-target-nix-system’ to query the list, which always returns a Nix system identifier. * gnu/packages/bootloaders.scm (grub)[inputs]: Use ‘current-target-nix-system’ to query membership in (package-supported-systems). * gnu/packages/pciutils.scm (pciutils): Likewise. --- gnu/packages/bootloaders.scm | 9 +++------ gnu/packages/pciutils.scm | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 742992a119b2..be51fb0c3de4 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -182,16 +182,14 @@ ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and ;; 'grub-install' to recognize mapped devices (LUKS, etc.) - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems lvm2)) `(("lvm2" ,lvm2)) '()) ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' ;; to determine whether the root file system is RAID. - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems mdadm)) `(("mdadm" ,mdadm)) '()) @@ -202,8 +200,7 @@ ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given ;; file system will be readable by GRUB without rebooting. - ,@(if (member (or (%current-target-system) - (%current-system)) + ,@(if (member (current-target-nix-system) (package-supported-systems fuse)) `(("fuse" ,fuse)) '()) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d7d224b292f2..f2196c4e53ae 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -112,8 +112,7 @@ `(("which" ,which) ("pkg-config" ,pkg-config))) (inputs - `(,@(if (member (or (%current-target-system) - (%current-system)) + `(,@(if (member (current-target-nix-system) (package-supported-systems kmod)) `(("kmod" ,kmod)) '())