From patchwork Sun Dec 4 04:43:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45043 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 22FC927BBEC; Sun, 4 Dec 2022 04:45:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 396C127BBE9 for ; Sun, 4 Dec 2022 04:45:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1gsD-0007sh-Ec; Sat, 03 Dec 2022 23:45:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1gsB-0007s5-EV for guix-patches@gnu.org; Sat, 03 Dec 2022 23:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1gsB-0002yb-4l for guix-patches@gnu.org; Sat, 03 Dec 2022 23:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1gsA-0006Bq-HN for guix-patches@gnu.org; Sat, 03 Dec 2022 23:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59661] [PATCH v2 1/3] system: Rename and move %base-packages-disk-utilities. References: <20221128191831.1325-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221128191831.1325-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Dec 2022 04:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59661@debbugs.gnu.org Cc: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59661-submit@debbugs.gnu.org id=B59661.167012904323747 (code B ref 59661); Sun, 04 Dec 2022 04:45:02 +0000 Received: (at 59661) by debbugs.gnu.org; 4 Dec 2022 04:44:03 +0000 Received: from localhost ([127.0.0.1]:55167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1grD-0006Ax-54 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 23:44:03 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1grB-0006AQ-Rb for 59661@debbugs.gnu.org; Sat, 03 Dec 2022 23:44:02 -0500 Received: by mail-qv1-f51.google.com with SMTP id d2so6137985qvp.12 for <59661@debbugs.gnu.org>; Sat, 03 Dec 2022 20:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YChF74t2kCjVmzLtc3VVwUQ1Wqz7G6sD7m6m1FBRe7A=; b=MB7DZKP+abALI/00Iz6GCBmJocjSSeo5mNygLu044Jw9zsdjL8y7uNqo+xpkyBcTND U5ogVlF8/ad1sYfpLJKweKSG/g+IA7wNKoNe92QZ4OhkXrUaFrkisVPlZxBLpbjzmFbi D/XqC2jyHFf8eMGyZlBpMRVHmLLtZaeIIL8hlPyJLtF5f6LMKvR5wmDUbLP6PEombZPc 2OCYSjGAvUiioHxLf2krCJIOjk4RCqtJebBE02gNyzbHUc+UUC5Hjiqrk/oD2k2WV+47 qPZAAqPryOTq+d7t25fIrtzFP6lc9vse9VMQfcqdmjS5Yt+xskAWSKIH83Qr8vM7TygU 3thg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YChF74t2kCjVmzLtc3VVwUQ1Wqz7G6sD7m6m1FBRe7A=; b=DHgCahAQ2zimg5YeftKkjU6O8T5biWHl4/PnXjWz2/fLpXE+CG41+xSh2VURIxBGdy nXLB2ddLQHhX0JffLDah7G6phTmSIaJEHE7iBbj9L1MQRXr/0MUPEHyHpoBaHBJqqMLe DghodEoFX9z3tvLWlA4h5IqTeFU9/0KPu8vLYUtCZ/vJ0RTwDF4s3RSOVb0NsMlL01mj kOOHnchBWtBUFLtEBDnQsHx34c4NoH3DK2+3siePoKNO/OlQIOtpA+7h4xvufyEtfIkL 5q4M00Ek8uisU9gqL117zANPU85pPTrDJEvrdaiO9QPzdi05shoBhYSnRWlIDFkY6vkz zaPw== X-Gm-Message-State: ANoB5pmtnkZM+TioKx8uB+K0qWHIu7SDTw6wBBsYRjQ0nVW5I5XK5NsV VjP/XmMGV2qEhpOh7QFeJJohi26hRD4= X-Google-Smtp-Source: AA0mqf5wZ/7tz68AVRsxrKZ7U3jtzEub9gQIUCv3Z9ei1c3SQEbQgJSpatb/vZFqIAmKs4z711ItWg== X-Received: by 2002:ad4:4202:0:b0:4c6:fd1d:c7cf with SMTP id k2-20020ad44202000000b004c6fd1dc7cfmr29515591qvp.19.1670129035780; Sat, 03 Dec 2022 20:43:55 -0800 (PST) Received: from localhost.localdomain (dsl-157-235.b2b2c.ca. [66.158.157.235]) by smtp.gmail.com with ESMTPSA id x22-20020ac84a16000000b003a68f5d98c1sm6905272qtq.93.2022.12.03.20.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 20:43:55 -0800 (PST) From: Maxim Cournoyer Date: Sat, 3 Dec 2022 23:43:45 -0500 Message-Id: <20221204044347.23147-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: bf46192d4c7c4cd8d71edb8ace2cdf86322aafe7 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")