From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 59661@debbugs.gnu.org
Cc: ludo@gnu.org, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#59661] [PATCH v2 1/3] system: Rename and move %base-packages-disk-utilities.
Date: Sat, 3 Dec 2022 23:43:45 -0500 [thread overview]
Message-ID: <20221204044347.23147-1-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20221128191831.1325-1-maxim.cournoyer@gmail.com>
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.
---
gnu/system.scm | 19 ++-----------------
gnu/system/install.scm | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 3478afcec4..1c119c31b6 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -38,6 +38,7 @@ (define-module (gnu system)
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (guix packages)
+ #:use-module (guix deprecation)
#:use-module (guix derivations)
#:use-module (guix profiles)
#:use-module ((guix utils) #:select (substitute-keyword-arguments))
@@ -49,9 +50,6 @@ (define-module (gnu system)
#: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)
@@ -896,20 +894,7 @@ (define %base-packages-networking
;; many people are familiar with, so keep it around.
iw wireless-tools))
-(define %base-packages-disk-utilities
- ;; A well-rounded set of packages for interacting with disks,
- ;; partitions and filesystems, included with the Guix installation
- ;; image.
- (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
- xfsprogs))
+(define-deprecated %base-packages-disk-utilities #f '())
(define %base-packages
;; Default set of packages globally visible. It should include anything
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 003c49a3e7..d34d974338 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -48,6 +48,9 @@ (define-module (gnu system install)
#:use-module (gnu packages bootloaders)
#:use-module (gnu packages certs)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cryptsetup)
+ #:use-module (gnu packages disk)
+ #:use-module (gnu packages file-systems)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages guile)
@@ -458,6 +461,20 @@ (define %issue
\x1b[1;33mUse Alt-F2 for documentation.\x1b[0m
")
+(define %installer-disk-utilities
+ ;; A well-rounded set of packages for interacting with disks, partitions and
+ ;; file systems, included with the Guix installation image.
+ (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
+ xfsprogs))
+
(define installation-os
;; The operating system used on installation images for USB sticks etc.
(operating-system
@@ -530,7 +547,7 @@ (define installation-os
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
+ %installer-disk-utilities
%base-packages))))
(define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0")
base-commit: bf46192d4c7c4cd8d71edb8ace2cdf86322aafe7
--
2.38.1
next prev parent reply other threads:[~2022-12-04 4:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 19:18 [bug#59661] [PATCH 0/3] Add e2fsprogs to %base-packages-utils Maxim Cournoyer
2022-11-28 20:01 ` [bug#59661] [PATCH 1/3] system: Rename and move %base-packages-disk-utilities Maxim Cournoyer
2022-11-28 20:01 ` [bug#59661] [PATCH 2/3] install: Add missing e2fsprogs utility Maxim Cournoyer
2022-11-28 20:01 ` [bug#59661] [PATCH 3/3] system: Add e2fsprogs to %base-packages-utils Maxim Cournoyer
2022-12-04 4:43 ` Maxim Cournoyer [this message]
2022-12-04 4:43 ` [bug#59661] [PATCH v2 2/3] install: Add missing e2fsprogs utility Maxim Cournoyer
2022-12-04 16:34 ` Ludovic Courtès
2022-12-04 17:28 ` [bug#59661] [PATCH 0/3] Add e2fsprogs to %base-packages-utils Ludovic Courtès
2022-12-05 16:44 ` bug#59661: " Maxim Cournoyer
2022-12-04 4:43 ` [bug#59661] [PATCH v2 3/3] system: " Maxim Cournoyer
2022-12-04 16:36 ` Ludovic Courtès
2022-12-04 16:20 ` [bug#59661] [PATCH v2 1/3] system: Rename and move %base-packages-disk-utilities Ludovic Courtès
2022-12-04 21:38 ` Maxim Cournoyer
2022-12-05 15:32 ` [bug#59661] [PATCH 0/3] Add e2fsprogs to %base-packages-utils Ludovic Courtès
2022-12-05 10:36 ` [bug#59661] [PATCH v2 1/3] system: Rename and move %base-packages-disk-utilities Efraim Flashner
2022-12-05 15:30 ` Maxim Cournoyer
2022-12-05 15:34 ` [bug#59661] [PATCH 0/3] Add e2fsprogs to %base-packages-utils Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221204044347.23147-1-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=59661@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).