diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-10-09 12:51:26 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-10-15 11:13:24 +0300 |
| commit | 4170af491c8bc3b0a5308116a26e758d8ff245c5 (patch) | |
| tree | 87e6b84220f5796679dd7458f79cc5471ca85de8 | |
| parent | e6e076281e62518056987e9ddd3d96fccab20475 (diff) | |
| download | guix-4170af491c8bc3b0a5308116a26e758d8ff245c5.tar guix-4170af491c8bc3b0a5308116a26e758d8ff245c5.tar.gz | |
install: Deduplicate packages with %base-package sets.
* gnu/system.scm (%base-packages-interactive): Add nvi.
* gnu/system/install.scm (installation-os)[packages]: Remove parted,
gptfdisk, ddrescue, cryptsetup, mdadm, dosfstools, btrfs-progs,
f2fs-tools, jfstools, openssh, wireless-tools, iw,
wpa-supplicant-minimal, iproute, bash-completion, nvi. Add
%base-packages-disk-utilities.
| -rw-r--r-- | gnu/system.scm | 2 | ||||
| -rw-r--r-- | gnu/system/install.scm | 37 |
2 files changed, 12 insertions, 27 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index a56fdc6304..59dfeb99b4 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages nano) + #:use-module (gnu packages nvi) #:use-module (gnu packages package-management) #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) @@ -715,6 +716,7 @@ of PROVENANCE-SERVICE-TYPE to its services." (define %base-packages-interactive ;; Default set of common interactive packages. (list less zile nano + nvi man-db info-reader ;the standalone Info reader (no Perl) bash-completion diff --git a/gnu/system/install.scm b/gnu/system/install.scm index eb342665e5..7701297411 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,18 +42,13 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) - #:use-module (gnu packages file-systems) + #:use-module (gnu packages compression) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) #:use-module (gnu packages linux) - #:use-module (gnu packages ssh) - #:use-module (gnu packages cryptsetup) #:use-module (gnu packages package-management) - #:use-module (gnu packages disk) #:use-module (gnu packages texinfo) - #:use-module (gnu packages compression) - #:use-module (gnu packages nvi) #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-26) @@ -496,27 +492,14 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Explicitly allow for empty passwords. (base-pam-services #:allow-empty-passwords? #t)) - (packages (cons* glibc ;for 'tzselect' & co. - parted gptfdisk ddrescue - fontconfig - font-dejavu font-gnu-unifont - grub ;mostly so xrefs to its manual work - cryptsetup - mdadm - dosfstools ;mkfs.fat, for the UEFI boot partition - btrfs-progs - f2fs-tools - jfsutils - openssh ;we already have sshd, having ssh/scp can help - wireless-tools iw wpa-supplicant-minimal iproute - ;; XXX: We used to have GNU fdisk here, but as of version - ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable - ;; space; furthermore util-linux's fdisk is already - ;; available here, so we keep that. - bash-completion - nvi ;:wq! - nss-certs ; To access HTTPS, use git, etc. - %base-packages)))) + (packages (append + (list glibc ; for 'tzselect' & co. + fontconfig + font-dejavu font-gnu-unifont + grub ; mostly so xrefs to its manual work + nss-certs) ; To access HTTPS, use git, etc. + %base-packages-disk-utilities + %base-packages)))) (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") (triplet "arm-linux-gnueabihf")) |