guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/14: system: Fix duplicate nss-certs check.


From: guix-commits
Subject: 04/14: system: Fix duplicate nss-certs check.
Date: Sun, 28 Apr 2024 10:40:33 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit c85a7e1b2bea99783990b11baa7dbac1c448ce06
Author: nathan <nathan_mail@nborghese.com>
AuthorDate: Fri Apr 26 19:12:42 2024 -0400

    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.
    
    Fixes: https://issues.guix.gnu.org/70624
    Change-Id: I91c64ca2c463ef5c35fa23856e4622e364e58988
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 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 @@ VERSION is the target version of the boot-parameters 
record."
   ;; 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]