From patchwork Fri Apr 26 23:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nathan X-Patchwork-Id: 63412 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 15FF127BBE9; Sat, 27 Apr 2024 00:32:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A4EB127BBE2 for ; Sat, 27 Apr 2024 00:32:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0V2i-00061D-P9; Fri, 26 Apr 2024 19:31:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0V2h-00060l-4U for guix-patches@gnu.org; Fri, 26 Apr 2024 19:31:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0V2g-0002bK-Re for guix-patches@gnu.org; Fri, 26 Apr 2024 19:31:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0V2z-0000Uv-3i for guix-patches@gnu.org; Fri, 26 Apr 2024 19:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70598] [PATCH] system: fix duplicate nss-certs check Resent-From: nathan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Apr 2024 23:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70598 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70598@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17141742771328 (code B ref -1); Fri, 26 Apr 2024 23:32:04 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2024 23:31:17 +0000 Received: from localhost ([127.0.0.1]:38661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0V2B-0000LC-Q6 for submit@debbugs.gnu.org; Fri, 26 Apr 2024 19:31:16 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0V28-0000J9-LX for submit@debbugs.gnu.org; Fri, 26 Apr 2024 19:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0V1g-0005up-QT for guix-patches@gnu.org; Fri, 26 Apr 2024 19:30:45 -0400 Received: from mail.nborghese.com ([207.148.28.48]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0V1f-0002VT-7Q for guix-patches@gnu.org; Fri, 26 Apr 2024 19:30:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=qpc1Y7shDJ8hQ 9iiVlE/Z0CaJjqPtt2rdzAC0pSWRmo=; h=subject:from:to:date; d=nborghese.com; b=SSK2zec0Vphch03ulXrbXzZp5F+jXY8qRkzOnJ17w4BX57n4F5m qV+TiWdsv92oZfvDNNySoJ1YV9BmFKWhUDwNSv835uxClLrgO5GE+8X0fNwRVM0mIKJtWq Egfl70hd/Ii0X01vGPlPadN4QYvVlMPghDljB6buM8QEfjMJsk= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id f2576684 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 26 Apr 2024 23:30:10 +0000 (UTC) Message-ID: <0f9cb434-38e4-70d8-4f89-9d81a8681ba5@nborghese.com> Date: Fri, 26 Apr 2024 23:30:39 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US Received-SPF: pass client-ip=207.148.28.48; envelope-from=nathan_mail@nborghese.com; helo=mail.nborghese.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: nathan X-ACL-Warn: , nathan via Guix-patches X-Patchwork-Original-From: nathan via Guix-patches via From: nathan Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches oops From 22f2511d50d1912191dd1bc69419b13370280018 Mon Sep 17 00:00:00 2001 Message-ID: <22f2511d50d1912191dd1bc69419b13370280018.1714173615.git.nathan_mail@nborghese.com> From: nathan Date: Fri, 26 Apr 2024 19:12:42 -0400 Subject: [PATCH] system: fix duplicate nss-certs check * gnu/system.scm (operating-system-packages): Because packages->manifest allows other formats, don't assume it's a package object in the list. Change-Id: I91c64ca2c463ef5c35fa23856e4622e364e58988 --- gnu/system.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 025834328c..cb6e719ca6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -325,7 +325,9 @@ (define (operating-system-packages os) ;; field contains a duplicated nss-certs packages. (let* ((packages (%operating-system-packages os)) (nss-certs-packages (sort (filter (lambda (p) - (string=? "nss-certs" (package-name p))) + (and (package? p) + (string=? "nss-certs" + (package-name p)))) packages) (lambda (x y) ;; Sort from newer to older versions. base-commit: c81ed0970007810a4662edbc3474f5afc656fe95 -- 2.41.0