diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-11-28 13:57:58 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-05 10:38:41 -0500 |
| commit | 1603c78aa4657d9f6e3b7cf1daace40043ff3e9a (patch) | |
| tree | abaff7eab8ffe8c552033d3053e6b0d77b4c7462 /gnu/system/install.scm | |
| parent | 7fde16671523f3fc3bda0c07a47a1fa33f8675b1 (diff) | |
system: Rename and move %base-packages-disk-utilities.
Rationale: It is only used in INSTALLATION-OS and doesn't make sense to be
used in another context, given that file systems now automatically pull their
dependencies since commit 45eac6cdf5c8d9d7b0c564b105c790d2d2007799 (services:
Add file system utilities to profile).
* gnu/system.scm (%base-packages-disk-utilities): Deprecate and rename to...
* gnu/system/install.scm (%installer-disk-utilities): ... this.
(installation-os) [packages]: Adjust accordingly.
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 003c49a3e71..d34d9743387 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm | |||
| @@ -48,6 +48,9 @@ | |||
| 48 | #:use-module (gnu packages bootloaders) | 48 | #:use-module (gnu packages bootloaders) |
| 49 | #:use-module (gnu packages certs) | 49 | #:use-module (gnu packages certs) |
| 50 | #:use-module (gnu packages compression) | 50 | #:use-module (gnu packages compression) |
| 51 | #:use-module (gnu packages cryptsetup) | ||
| 52 | #:use-module (gnu packages disk) | ||
| 53 | #:use-module (gnu packages file-systems) | ||
| 51 | #:use-module (gnu packages fonts) | 54 | #:use-module (gnu packages fonts) |
| 52 | #:use-module (gnu packages fontutils) | 55 | #:use-module (gnu packages fontutils) |
| 53 | #:use-module (gnu packages guile) | 56 | #:use-module (gnu packages guile) |
| @@ -458,6 +461,20 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m | |||
| 458 | \x1b[1;33mUse Alt-F2 for documentation.\x1b[0m | 461 | \x1b[1;33mUse Alt-F2 for documentation.\x1b[0m |
| 459 | ") | 462 | ") |
| 460 | 463 | ||
| 464 | (define %installer-disk-utilities | ||
| 465 | ;; A well-rounded set of packages for interacting with disks, partitions and | ||
| 466 | ;; file systems, included with the Guix installation image. | ||
| 467 | (list parted gptfdisk ddrescue | ||
| 468 | ;; We used to provide fdisk from GNU fdisk, but as of version 2.0.0a | ||
| 469 | ;; it pulls Guile 1.8, which takes unreasonable space; furthermore | ||
| 470 | ;; util-linux's fdisk is already available, in %base-packages-linux. | ||
| 471 | cryptsetup mdadm | ||
| 472 | dosfstools | ||
| 473 | btrfs-progs | ||
| 474 | f2fs-tools | ||
| 475 | jfsutils | ||
| 476 | xfsprogs)) | ||
| 477 | |||
| 461 | (define installation-os | 478 | (define installation-os |
| 462 | ;; The operating system used on installation images for USB sticks etc. | 479 | ;; The operating system used on installation images for USB sticks etc. |
| 463 | (operating-system | 480 | (operating-system |
| @@ -530,7 +547,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m | |||
| 530 | font-dejavu font-gnu-unifont | 547 | font-dejavu font-gnu-unifont |
| 531 | grub ; mostly so xrefs to its manual work | 548 | grub ; mostly so xrefs to its manual work |
| 532 | nss-certs) ; To access HTTPS, use git, etc. | 549 | nss-certs) ; To access HTTPS, use git, etc. |
| 533 | %base-packages-disk-utilities | 550 | %installer-disk-utilities |
| 534 | %base-packages)))) | 551 | %base-packages)))) |
| 535 | 552 | ||
| 536 | (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") | 553 | (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") |
