summaryrefslogtreecommitdiff
path: root/gnu/system/hurd.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-03-21 23:39:43 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-03-21 23:39:43 -0400
commita9429c8f2207841c649438187d6e19046d323a16 (patch)
treea06e4b8a87b6a42742cf6750276746a10b6c2139 /gnu/system/hurd.scm
parentf0136b36ae8c1e9c174043bd50e0e24413c0f345 (diff)
parent49b350fafc2c3ea1db66461b73d4e304cd13ec92 (diff)
Merge branch 'staging' into core-updates.
Diffstat (limited to 'gnu/system/hurd.scm')
-rw-r--r--gnu/system/hurd.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 2acc7b7e11..8e95d0a16c 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
@@ -65,10 +65,13 @@
gnumach)))
(define %base-packages/hurd
- (list hurd bash coreutils file findutils grep sed
+ ;; Note: the Shepherd comes before the Hurd, not just because its duty is to
+ ;; shepherd the herd, but also because we want its 'halt' and 'reboot'
+ ;; commands to take precedence.
+ (list shepherd hurd bash coreutils file findutils grep sed
diffutils patch gawk tar gzip bzip2 xz lzip
guile-3.0-latest guile-colorized guile-readline
- net-base inetutils less shadow shepherd sudo which
+ net-base inetutils less shadow sudo which
info-reader))
(define %base-services/hurd