| Message ID | 20201009134253.26375-1-efraim@flashner.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Deduplicate package sets | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/submitting builds | success | |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
Hi! Efraim Flashner <efraim@flashner.co.il> skribis: > * gnu/system.scm (%base-packages-disk-utils): New variable. [...] > #:use-module (guix diagnostics) > + #:use-module (gnu packages admin) > #:use-module (gnu packages base) > #:use-module (gnu packages bash) > + #:use-module (gnu packages compression) > #:use-module (gnu packages cross-base) > + #:use-module (gnu packages cryptsetup) > + #:use-module (gnu packages disk) > + #:use-module (gnu packages file-systems) > + #:use-module (gnu packages firmware) > + #:use-module (gnu packages gawk) > #:use-module (gnu packages guile) > #:use-module (gnu packages guile-xyz) > - #:use-module (gnu packages admin) > #:use-module (gnu packages hurd) > - #:use-module (gnu packages linux) > - #:use-module (gnu packages pciutils) > - #:use-module (gnu packages package-management) > #:use-module (gnu packages less) > - #:use-module (gnu packages zile) > - #:use-module (gnu packages nano) > - #:use-module (gnu packages gawk) > + #:use-module (gnu packages linux) > #:use-module (gnu packages man) > + #:use-module (gnu packages nano) > + #:use-module (gnu packages package-management) > + #:use-module (gnu packages pciutils) > #:use-module (gnu packages texinfo) > - #:use-module (gnu packages compression) > - #:use-module (gnu packages firmware) > + #:use-module (gnu packages zile) > #:use-module (gnu services) > #:use-module (gnu services shepherd) > #:use-module (gnu services base) Does it pull new modules or just reorder them? If the latter, fine with me! > @@ -159,6 +163,7 @@ > %base-packages-interactive > %base-packages-linux > %base-packages-networking > + %base-packages-disk-utils > %base-packages-utils Now there’s a precedent but I think we should have written “utilities” for consistency with the rest of the code base. Maybe you can do that here and then we can deprecate ‘%base-packages-utils’ in favor of ‘%base-package-utilities’. Thanks, Ludo’.
On Wed, Oct 14, 2020 at 11:17:08AM +0200, Ludovic Courtès wrote: > Hi! > > Efraim Flashner <efraim@flashner.co.il> skribis: > > > * gnu/system.scm (%base-packages-disk-utils): New variable. > > > [...] > > > #:use-module (guix diagnostics) > > + #:use-module (gnu packages admin) > > #:use-module (gnu packages base) > > #:use-module (gnu packages bash) > > + #:use-module (gnu packages compression) > > #:use-module (gnu packages cross-base) > > + #:use-module (gnu packages cryptsetup) > > + #:use-module (gnu packages disk) > > + #:use-module (gnu packages file-systems) > > + #:use-module (gnu packages firmware) > > + #:use-module (gnu packages gawk) > > #:use-module (gnu packages guile) > > #:use-module (gnu packages guile-xyz) > > - #:use-module (gnu packages admin) > > #:use-module (gnu packages hurd) > > - #:use-module (gnu packages linux) > > - #:use-module (gnu packages pciutils) > > - #:use-module (gnu packages package-management) > > #:use-module (gnu packages less) > > - #:use-module (gnu packages zile) > > - #:use-module (gnu packages nano) > > - #:use-module (gnu packages gawk) > > + #:use-module (gnu packages linux) > > #:use-module (gnu packages man) > > + #:use-module (gnu packages nano) > > + #:use-module (gnu packages package-management) > > + #:use-module (gnu packages pciutils) > > #:use-module (gnu packages texinfo) > > - #:use-module (gnu packages compression) > > - #:use-module (gnu packages firmware) > > + #:use-module (gnu packages zile) > > #:use-module (gnu services) > > #:use-module (gnu services shepherd) > > #:use-module (gnu services base) > > Does it pull new modules or just reorder them? If the latter, fine with me! It reorders them and adds cryptsetup, disk and file-systems. > > @@ -159,6 +163,7 @@ > > %base-packages-interactive > > %base-packages-linux > > %base-packages-networking > > + %base-packages-disk-utils > > %base-packages-utils > > Now there’s a precedent but I think we should have written “utilities” > for consistency with the rest of the code base. > > Maybe you can do that here and then we can deprecate > ‘%base-packages-utils’ in favor of ‘%base-package-utilities’. +1 for utilities over utils > Thanks, > Ludo’.
Patches pushed!
diff --git a/gnu/system.scm b/gnu/system.scm index 3f4a0065d0..b10e94b95b 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jannek@gnu.org> +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,24 +39,27 @@ #:use-module ((guix utils) #:select (substitute-keyword-arguments)) #:use-module (guix i18n) #:use-module (guix diagnostics) + #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) + #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages disk) + #:use-module (gnu packages file-systems) + #:use-module (gnu packages firmware) + #:use-module (gnu packages gawk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages admin) #:use-module (gnu packages hurd) - #:use-module (gnu packages linux) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages package-management) #:use-module (gnu packages less) - #:use-module (gnu packages zile) - #:use-module (gnu packages nano) - #:use-module (gnu packages gawk) + #:use-module (gnu packages linux) #:use-module (gnu packages man) + #:use-module (gnu packages nano) + #:use-module (gnu packages package-management) + #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) - #:use-module (gnu packages compression) - #:use-module (gnu packages firmware) + #:use-module (gnu packages zile) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services base) @@ -159,6 +163,7 @@ %base-packages-interactive %base-packages-linux %base-packages-networking + %base-packages-disk-utils %base-packages-utils %base-firmware %default-kernel-arguments)) @@ -726,6 +731,19 @@ of PROVENANCE-SERVICE-TYPE to its services." ;; many people are familiar with, so keep it around. iw wireless-tools)) +(define %base-packages-disk-utils + ;; A well-rounded set of packages for interacting with disks, partitions + ;; and filesystems. + (list parted gptfdisk ddrescue + ;; We used to provide fdisk from GNU fdisk, but as of version 2.0.0a + ;; it pulls Guile 1.8, which takes unreasonable space; furthermore + ;; util-linux's fdisk is already available, in %base-packages-linux. + cryptsetup mdadm + dosfstools + btrfs-progs + f2fs-tools + jfsutils)) + (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks.