From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 03:44:46 2022 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 Subject: [PATCH v3] guix: Filter unspecified inputs when sanitizing. to: 57704@debbugs.gnu.org Content-Transfer-Encoding: 7bit Message-ID: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57704 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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