summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2026-08-26 13:26:40 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2026-08-26 13:30:40 +0900
commitbddb1ece34331637454a8c2281e625ab829ef204 (patch)
tree2e02a56325a5d8bf764e8b8af016292c8abe810e /etc
parent463ef2011c6f31f0c40a24fa0d7ce50acd8d332b (diff)
maint: Replace remaining usages of isc-dhcp with dhcpcd.
isc-dhcp has been unmaintained since 2022. This is a follow-up to commit 3e713ae41c73b352fad4830b23721ee07935c512. * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Adjust example. * etc/manifests/cross-compile.scm (%system-packages) * etc/manifests/release-desktop.scm (%desktop-packages) * etc/manifests/release-minimal.scm (%system-packages): Replace "isc-dhcp" with "dhcpcd". * gnu/system.scm (%base-packages-networking): Likewise. * gnu/tests/install.scm (%simple-installation-script) (%extlinux-gpt-installation-script) (%simple-installation-script-for-/dev/vda) (%separate-store-installation-script) (%extra-encrypted-packages): Likewise.
Diffstat (limited to 'etc')
-rw-r--r--etc/manifests/cross-compile.scm2
-rw-r--r--etc/manifests/release-desktop.scm2
-rw-r--r--etc/manifests/release-minimal.scm2
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm
index c74e62ab10b..9094ac40add 100644
--- a/etc/manifests/cross-compile.scm
+++ b/etc/manifests/cross-compile.scm
@@ -68,7 +68,7 @@ TARGET."
68 ;; Key packages proposed by the Guix System installer. 68 ;; Key packages proposed by the Guix System installer.
69 (map specification->package 69 (map specification->package
70 '("openssh" "tor" "ntp" "gpm" 70 '("openssh" "tor" "ntp" "gpm"
71 "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" 71 "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
72 "linux-libre" "grub-hybrid"))) 72 "linux-libre" "grub-hybrid")))
73 73
74(define (%system-gui-packages target) 74(define (%system-gui-packages target)
diff --git a/etc/manifests/release-desktop.scm b/etc/manifests/release-desktop.scm
index 89175418bc2..09c03e6e217 100644
--- a/etc/manifests/release-desktop.scm
+++ b/etc/manifests/release-desktop.scm
@@ -117,7 +117,7 @@
117 "usbutils" 117 "usbutils"
118 "util-linux-with-udev" 118 "util-linux-with-udev"
119 "kmod" 119 "kmod"
120 "isc-dhcp" 120 "dhcpcd"
121 "iproute2" 121 "iproute2"
122 "wget" 122 "wget"
123 "nss-certs" 123 "nss-certs"
diff --git a/etc/manifests/release-minimal.scm b/etc/manifests/release-minimal.scm
index 5a1f3dcdc80..d1c4fe3acca 100644
--- a/etc/manifests/release-minimal.scm
+++ b/etc/manifests/release-minimal.scm
@@ -48,7 +48,7 @@ TARGET."
48 (append (map specification->package 48 (append (map specification->package
49 '("guix" "shepherd" "guile-static-initrd" 49 '("guix" "shepherd" "guile-static-initrd"
50 "openssh" "tor" "ntp" "gpm" "mingetty" 50 "openssh" "tor" "ntp" "gpm" "mingetty"
51 "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" 51 "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
52 "linux-libre" "grub-hybrid" 52 "linux-libre" "grub-hybrid"
53 ;; privileged programs 53 ;; privileged programs
54 "shadow" "sudo" "fuse" "inetutils" "util-linux")) 54 "shadow" "sudo" "fuse" "inetutils" "util-linux"))