diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
| commit | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (patch) | |
| tree | c7e5cb013abc742734acd9613674df4ebddfdeef /gnu/system | |
| parent | 82bdb77082fa4e100761f70086b745dfb280c3ac (diff) | |
| parent | 445a0359083388b5ee686e6e855f94a3aac5f79c (diff) | |
| download | guix-gnome-team.tar.gz | |
Merge branch 'master' into gnome-team gnome-team
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/bare-hurd.tmpl | 4 | ||||
| -rw-r--r-- | gnu/system/hurd.scm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index f0dd0cf742..463c7ee798 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -5,12 +5,12 @@ ;; To build a disk image for a virtual machine, do ;; -;; ./pre-inst-env guix system image --target=i586-pc-gnu \ +;; ./pre-inst-env guix system image --image-type=hurd-raw \ ;; gnu/system/examples/bare-hurd.tmpl ;; ;; You may run it like so ;; -;; guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \ +;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ ;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ ;; -snapshot -hda <the-image> ;; diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 387605ec4f..22dafae622 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +68,7 @@ ;; 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-0.8 hurd bash coreutils file findutils grep sed + (list shepherd-0.8 hurd netdde 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 sudo which |