From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oLhhO5NAHGPKjgAAbAwnHQ (envelope-from ) for ; Sat, 10 Sep 2022 09:45:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oFGNOpNAHGM1BwEAG6o9tA (envelope-from ) for ; Sat, 10 Sep 2022 09:45:23 +0200 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 931711A25B for ; Sat, 10 Sep 2022 09:45:23 +0200 (CEST) Received: from localhost ([::1]:46364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWvB4-0003Zm-Lw for larch@yhetil.org; Sat, 10 Sep 2022 03:45:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWvAr-0003ZH-E2 for guix-patches@gnu.org; Sat, 10 Sep 2022 03:45:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWvAk-0007Hp-Ml for guix-patches@gnu.org; Sat, 10 Sep 2022 03:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWvAk-0002up-Ib for guix-patches@gnu.org; Sat, 10 Sep 2022 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57704] [PATCH v3] guix: Filter unspecified inputs when sanitizing. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Sep 2022 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57704@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 57704-submit@debbugs.gnu.org id=B57704.166279588611156 (code B ref 57704); Sat, 10 Sep 2022 07:45:02 +0000 Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 07:44:46 +0000 Received: from localhost ([127.0.0.1]:36505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWvAU-0002ts-3r for submit@debbugs.gnu.org; Sat, 10 Sep 2022 03:44:46 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWvAT-0002th-9z for 57704@debbugs.gnu.org; Sat, 10 Sep 2022 03:44:45 -0400 Received: by mail-ej1-f68.google.com with SMTP id v16so9061251ejr.10 for <57704@debbugs.gnu.org>; Sat, 10 Sep 2022 00:44:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date; bh=uSCj16rycL81O8iLtr0I5IDwb0xUxbxXOgC1ov/SzR4=; b=MHL8CG+oCjYpDURslIY7/uW3EFNtiEbOhgDMET26OrZhZHrilzzBMWv+a6nwDgaNQo ANRFlKAJhaKKkHlTSFCxlZTgDczfrUgZd78DiZzW3keXINauQoxC96lTLrsti1JWpTWh VrseAubY2YBJlpkqIuUAvwThU8LVh3lFDlPVC7E2tBup0G1P2yDcXLNJs06Gzp7jSF/Q JQj52fw56LBkHBYGlcRSLNC5uWfILiqOMzCeYyWUlAzglDdGaxsHxtI2azgIYMP6cwn3 k6isyySms76rZFwN82PDuxRJkCgEgPvdqIyANlohQS40GlVD37RXww4v4ZKKGlkDPZ5k Sr3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date; bh=uSCj16rycL81O8iLtr0I5IDwb0xUxbxXOgC1ov/SzR4=; b=fG2WeKfTHpyxNP3MGHZKYdCBk0PwLQSvLYY1MFEvAZNkCdlnW1LBBUTdtu5/bIuJvk vRPU5l+WDfOcSyzaswSaaspFWN7WOvPx/F2YWPkDmbAEz3aEnXhqN42eZB5jHLd0E1L8 xJZSZyA9xaeRPr8xgYTOGBrLgrYLvCnG5hUkvydKlo3Zs3JBfUAXpt5F0bQGa6ghkiD4 FFQf8rFi0uGspws+2nhlQ59+ZVMPGn1soUch0m38dNbpQO9NfVTwkDhbkVSFF4aSSjET pV2MryKZe76KjRVW1MzJnNtI+3YEG69tKsk2i6lfEt4xshNgitDyJAUsneSq4tncMsY+ ayaw== X-Gm-Message-State: ACgBeo3xke1tNhurPSjLjc+7KgvtP7pZd0rHrCMb65B88RBQIFgRcotc cSPsDCLwnGUh41KKvtm88EnGH0BjJm4= X-Google-Smtp-Source: AA6agR6X0Pma3fHciMw79lx1pkVKxlyQc443PBjhUcONi715A61e43xNtJ82DDUf+wMJ1wInMk3JmA== X-Received: by 2002:a17:907:1b1a:b0:74a:18f7:7f63 with SMTP id mp26-20020a1709071b1a00b0074a18f77f63mr13066130ejc.28.1662795879673; Sat, 10 Sep 2022 00:44:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w20-20020a170906185400b007713951ca7asm1335880eje.165.2022.09.10.00.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 00:44:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 10 Sep 2022 09:41:39 +0200 Content-Transfer-Encoding: 7bit Message-ID: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@gmail.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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662795923; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=uSCj16rycL81O8iLtr0I5IDwb0xUxbxXOgC1ov/SzR4=; b=XafdZg8urJ7oPVKL2xtKMzUemWcsP5X3j4hTpyXAi2/IpewRhvh76050xYZDyIlHyMQLZ9 hHtBYBYTEudD04Gco8DBtWhHc9f1BO610p1uGVJrpkr+1pdbK1Twz2MZAV6sTurUIK6tUZ cLJ60dBXiWS2NMge8OJGImD39lC/Dq5sKVM5VVA+3bBoI+fkvMFLydIs6LpPBBBVuRVYqj 2P/SSWQnpglL9+5NIYA1/ItTb/hMt3Hkc8m2xJbdIJtVAKN3TlKSBOgUlrWFkVXpi0q63y jGfUM90AraTkVuiqqfQ8wdj/rxXV0eeDUVvMtGp18y+yQa0NjkNLkCvpI0nBhA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662795923; a=rsa-sha256; cv=none; b=ILZnxwB12lALHOcz+qD4e6Ss7xnRhar3Ir1BaFQj1yRtNJpt2guBLS6zmpUegixhZxsLQR ntwxLxReYxnCOolzVveBw/D1UO/YJq53DBPQ1x+KRvD8OUSbLY/AmRB07nVE5O672woKkP x488LoUoRExAUE5Vyo75PtJq9C7706Qtd7IQkPQHxehm4C2tcUn4C4aYft28ngMsNmsSrU lCFpQ6MOkgC1FwNu7PFYW1WqHaXeDc529+nGaKkIHxoa3ykROIRcFSbBT+1AeCSRNZNQL1 IRS4zJsnjag+mZ9oA5UfcGFJg3UXiThQRrKbq1ECHjwHq1E+CBpv7cxY3suURg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MHL8CG+o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.71 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MHL8CG+o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 931711A25B X-Spam-Score: 7.71 X-Migadu-Scanner: scn1.migadu.com X-TUID: Q2aVhhu4cPgq * guix/packages.scm (sanitize-inputs): Filter inputs which are unspecified? rather than adding a label. --- guix/packages.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 94e464cd01..0975002c13 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -429,12 +429,15 @@ (define %cuirass-supported-systems (define-inlinable (sanitize-inputs inputs) "Sanitize INPUTS by turning it into a list of name/package tuples if it's -not already the case." +not already the case and removing unspecified inputs." (cond ((null? inputs) inputs) ((and (pair? (car inputs)) (string? (caar inputs))) inputs) - (else (map add-input-label inputs)))) + (else (filter-map (lambda (input) + (if (unspecified? input) #f + (add-input-label input))) + inputs)))) (define-syntax current-location-vector (lambda (s) -- 2.37.2