summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2026-05-11 14:49:30 +0200
committerJanneke Nieuwenhuizen <janneke@gnu.org>2026-05-13 20:42:36 +0200
commitc2abb6d048a62a1ee8369f1fd2fbb03a4780760a (patch)
tree3c3daaba891bc5e483ec3af4a17aaa88e336794e
parentd34477d22ec92608027ee0c5fdd0c33e9d98cb4e (diff)
system: hurd: Add e2fsprogs.
* etc/manifests/cross-compile.scm (%base-packages/hurd): Do not remove e2fsprogs. * gnu/system/hurd.scm (%base-packages/hurd): Add e2fsprogs. Change-Id: I45edf91846efed31309c4c30d185606ba68c3140 Co-authored-by: Brian Cully <bjc@spork.org>
-rw-r--r--etc/manifests/cross-compile.scm4
-rw-r--r--gnu/packages/hurd.scm3
-rw-r--r--gnu/system/hurd.scm2
3 files changed, 4 insertions, 5 deletions
diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm
index 776da581cf9..c74e62ab10b 100644
--- a/etc/manifests/cross-compile.scm
+++ b/etc/manifests/cross-compile.scm
@@ -1,6 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> 3;;; Copyright © 2020, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
4;;; Copyright © 2023 Andreas Enge <andreas@enge.fr> 4;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
5;;; Copyright © 2025 Efraim Flashner <efraim@flashner.co.il> 5;;; Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
6;;; 6;;;
@@ -61,7 +61,7 @@ TARGET."
61 ;; from the other package sets. 61 ;; from the other package sets.
62 (fold delete %base-packages 62 (fold delete %base-packages
63 (append (map specification->package 63 (append (map specification->package
64 '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) 64 '("kbd" "iproute2" "iw" "wireless-tools"))
65 %base-packages-linux))) 65 %base-packages-linux)))
66 66
67(define %system-packages 67(define %system-packages
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 103ce264dcb..5d1c6628090 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -526,8 +526,7 @@ exec ${system}/rc \"$@\"
526 ":" util-linux "/sbin\n")) 526 ":" util-linux "/sbin\n"))
527 (("/sbin/") (string-append out "/sbin/")) 527 (("/sbin/") (string-append out "/sbin/"))
528 (("/libexec/") (string-append out "/libexec/")) 528 (("/libexec/") (string-append out "/libexec/"))
529 (("/hurd/") (string-append out "/hurd/"))) 529 (("/hurd/") (string-append out "/hurd/"))))))
530 #t)))
531 (add-after 'patch-shebangs 'patch-libexec-shebangs 530 (add-after 'patch-shebangs 'patch-libexec-shebangs
532 (lambda* (#:key inputs outputs #:allow-other-keys) 531 (lambda* (#:key inputs outputs #:allow-other-keys)
533 ;; XXX: Since the 'patch-shebangs' phase doesn't traverse 532 ;; XXX: Since the 'patch-shebangs' phase doesn't traverse
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index ede9ed05321..2b5fb1589cf 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -73,7 +73,7 @@
73 diffutils patch gawk tar gzip bzip2 xz lzip zstd 73 diffutils patch gawk tar gzip bzip2 xz lzip zstd
74 guile-3.0-latest guile-colorized guile-readline 74 guile-3.0-latest guile-colorized guile-readline
75 net-base nss-certs inetutils less procps shadow sudo which 75 net-base nss-certs inetutils less procps shadow sudo which
76 info-reader pciutils)) 76 info-reader e2fsprogs pciutils))
77 77
78(define %base-services/hurd 78(define %base-services/hurd
79 (append (list (service hurd-console-service-type 79 (append (list (service hurd-console-service-type