guix-commits
[Top][All Lists]
Advanced

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

55/60: gnu: %boot0-inputs: Remove duplicate packages.


From: guix-commits
Subject: 55/60: gnu: %boot0-inputs: Remove duplicate packages.
Date: Sun, 24 Nov 2024 02:50:18 -0500 (EST)

efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.

commit 9ae681d5df83151ce3e43dcda511be562b652472
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 21 15:59:02 2024 +0300

    gnu: %boot0-inputs: Remove duplicate packages.
    
    * gnu/packages/commencement.scm (%boot0-inputs): When building for i686,
    x86-64 or riscv64 remove the old *-mesboot packages for newer *-boot0
    packages.
    
    Change-Id: Ide54f9185dd67765f4a35110c6bb47d5f61ba6b5
---
 gnu/packages/commencement.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d803ba9152..deca529dcf 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2886,13 +2886,19 @@ exec " gcc "/bin/" program
            ("gawk" ,gawk-boot0)
            ("patch" ,patch-boot0)
            ("sed" ,sed-boot0)
-           ("tar" ,tar-boot0)))
-        (_ '()))
-    ("make" ,gnu-make-boot0)
-    ("diffutils" ,diffutils-boot0)
-    ("findutils" ,findutils-boot0)
-    ("file" ,file-boot0)
-    ,@(%bootstrap-inputs+toolchain)))
+           ("tar" ,tar-boot0)
+           ("make" ,gnu-make-boot0)
+           ("diffutils" ,diffutils-boot0)
+           ("findutils" ,findutils-boot0)
+           ("file" ,file-boot0)
+           ,@(fold alist-delete (%bootstrap-inputs+toolchain)
+                   '("coreutils" "gawk" "patch" "sed" "tar" "make"))))
+        (_
+          `(("make" ,gnu-make-boot0)
+            ("diffutils" ,diffutils-boot0)
+            ("findutils" ,findutils-boot0)
+            ("file" ,file-boot0)
+            ,@(%bootstrap-inputs+toolchain))))))
 
 (define* (boot-triplet #:optional (system (%current-system)))
   ;; Return the triplet used to create the cross toolchain needed in the



reply via email to

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