From patchwork Sun Mar 27 21:40:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38152 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 EE68727BBE9; Sun, 27 Mar 2022 22:42:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7823427BBEA for ; Sun, 27 Mar 2022 22:42:10 +0100 (BST) Received: from localhost ([::1]:36228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYaeH-0006v1-Lo for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:42:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0006uj-S1 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYaeA-0005Yo-K6 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYaeA-0004XY-IL for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 5/6] gnu: Query membership in =?utf-8?b?4oCY?= =?utf-8?b?c3VwcG9ydGVkLXN5c3RlbXPigJk=?= list with Nix identifier Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:42:02 +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: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841727517377 (code B ref 49672); Sun, 27 Mar 2022 21:42:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:41:15 +0000 Received: from localhost ([127.0.0.1]:56693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadP-0004WC-0Y for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:15 -0400 Received: from mx.kolabnow.com ([212.103.80.153]:17940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadM-0004Vl-4w for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:12 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id AFDA940D4E; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Authentication-Results: ext-mx-out003.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com 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= 1648417266; x=1650231667; bh=ee/BH3KlfPSwyA77LPO8RpXondjoJNkN9c9 0OKSsP/U=; b=2eTL498tllzRLV47D2ek0ynjIKgrVqQ81Yq1ASmJLN2nVAzpKwe M3Opzmf39MdlyGFJsPYkHU5lsl3NwoXbQG+vVn2zsDRCerO1BoP6SUri9bc9vTZ9 dTTfzrS4kjr335Z0d8EtqMcSmP6rifk5SzoLGM+e545R3uHNlrPo9Hq2NkfR3nKv ffRhUoDoibS/fQOzsm9Rim5zRl8p206vOCIpLjlNkZh1R6Y+iDEMEfQId1a9dj8G QiOBlY8+XqFh4tQeLEoOcRKHVKjctL2Q5zvqOwWBt/37BwU/fns07X6bbrA+L6TH j9TYkuAfZBYsvKfDJPJ2Mqks50waoDWp8gi5EanJtjzd8hvQVYrDNVMJCcrsiTSH VQi5sk2YulCrcPFEy7O2IVla4tccUXy/9QASmSMfOwH4sSeg/hfm4mUH+LGBXWQB JSXHoV01WpuvVIGFG9h1y2icavCFEC35hwX9bHlv1+WTdpXxynmHOg5PMmz20TD6 9iFaQv8PPowMaBvDF6drQZ+VYGeFbLCYPhs175EswdvYdCh3Kj7uTerE4x+7NeCZ AuUid8jzCPcZV4mYtE4NEkUdvbRyC8vAWcDLXXskY7L4mF1aJsYS2YPgAX/Dn5gp aq0JpgiwipdWNcmgVr4lkcH2G3bKqtmR/V0qDeLKfffSnKb4O5zVy0po= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XMKkrEGiAY0W; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id 3E5294084C; Sun, 27 Mar 2022 23:41:06 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id B3DD2A86; Sun, 27 Mar 2022 23:41:05 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:25 -0300 Message-Id: <20220327214026.102723-6-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-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/bootloaders.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 40dd38fdd28a..98970450900e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -185,16 +185,14 @@ (define-public grub ;; 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)) '()) @@ -205,8 +203,7 @@ (define-public grub ;; 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)) '())