all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: nathan via Guix-patches via <guix-patches@gnu.org>
To: 70598@debbugs.gnu.org
Subject: [bug#70598] [PATCH] system: fix duplicate nss-certs check
Date: Fri, 26 Apr 2024 23:30:39 +0000	[thread overview]
Message-ID: <0f9cb434-38e4-70d8-4f89-9d81a8681ba5@nborghese.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 6 bytes --]

oops


[-- Attachment #2: 0001-system-fix-duplicate-nss-certs-check.patch --]
[-- Type: text/x-patch, Size: 1474 bytes --]

From 22f2511d50d1912191dd1bc69419b13370280018 Mon Sep 17 00:00:00 2001
Message-ID: <22f2511d50d1912191dd1bc69419b13370280018.1714173615.git.nathan_mail@nborghese.com>
From: nathan <nathan_mail@nborghese.com>
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


             reply	other threads:[~2024-04-26 23:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-26 23:30 nathan via Guix-patches via [this message]
2024-04-28 14:46 ` bug#70598: [PATCH] system: fix duplicate nss-certs check Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0f9cb434-38e4-70d8-4f89-9d81a8681ba5@nborghese.com \
    --to=guix-patches@gnu.org \
    --cc=70598@debbugs.gnu.org \
    --cc=nathan_mail@nborghese.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.