From patchwork Mon Nov 28 20:01:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 44895 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 1B91827BBEB; Mon, 28 Nov 2022 20:02:27 +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=unavailable 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 F3F4327BBE9 for ; Mon, 28 Nov 2022 20:02:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozkKK-0004QD-TH; Mon, 28 Nov 2022 15:02:04 -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 1ozkKI-0004Q1-Tr for guix-patches@gnu.org; Mon, 28 Nov 2022 15:02:02 -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 1ozkKI-0006bz-HL for guix-patches@gnu.org; Mon, 28 Nov 2022 15:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozkKI-0001qM-DO for guix-patches@gnu.org; Mon, 28 Nov 2022 15:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59661] [PATCH 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: Mon, 28 Nov 2022 20:02: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: Maxim Cournoyer Received: via spool by 59661-submit@debbugs.gnu.org id=B59661.16696657197063 (code B ref 59661); Mon, 28 Nov 2022 20:02:02 +0000 Received: (at 59661) by debbugs.gnu.org; 28 Nov 2022 20:01:59 +0000 Received: from localhost ([127.0.0.1]:50588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozkKF-0001pr-9d for submit@debbugs.gnu.org; Mon, 28 Nov 2022 15:01:59 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:38574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozkKD-0001pi-OA for 59661@debbugs.gnu.org; Mon, 28 Nov 2022 15:01:58 -0500 Received: by mail-qk1-f178.google.com with SMTP id i9so8170094qkl.5 for <59661@debbugs.gnu.org>; Mon, 28 Nov 2022 12:01:57 -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=qqn0QKbLK1uVyXq778hka5Ae8v7q41ZYfSAq9xBllTQ=; b=O/+psHTO0pxp/mt4S4dZ1lD2cbSqT9UEcB67iRXQMpTZn8v9Wb7fRjvDRuAQivZRyA C517+k+dvni//+dNyx+79oLM+Xk1b5B52OWvXXIJBES1kKBr17m4tj4HOuDzM6nm6vpZ sfn64Y2BIhSSk5u2dKskKi8CDzGElUMl9ymSqSFHAZbY8lSC4e+j3nBl0wbw7DT0VOO+ KcJ7FvNyrNm0MHwopAzZBMsPDuvhj4k5q6UtsOKUPykvlvHJuWcfzbzdPEJoprikwcLA Hmxafgul5n+3mH4clAMo+hs5AFxE+Zjyzm59pjqrdBHXKL/K7+qSyaa3C6ElBg97lWLo QgnA== 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=qqn0QKbLK1uVyXq778hka5Ae8v7q41ZYfSAq9xBllTQ=; b=2v6U2y2nJL5OM8cAAXUmrrpt7/2yIg0zEYKCVnuq+gLIYTfZMrFNS+pVbBqUK5TWYz Ef02Js90xeJ+r5uowgpZSA7VUyjnsO3uzm0WCl1ZAHF+XSpv5x1aDDaIug1u9si++Zly ragD/RJsigccJDCLAtHvz7DE9bMVuiGlXLjXXBBMdHASHj8twTQ+u83CFXLIUM8lNIMR q90t4Ewip+DxASK1LZnACQtoMWP5VyAwoeKdBZFqjFLel6CAZpySyHubpfbBbbP+xgw/ wmxxLNQzUvaKQhNf+sw4c3Eh2qh61pyyZ0o7/xVDqKZS580jHNmlx/cWB1CYVtDPJiYf x8zw== X-Gm-Message-State: ANoB5pkL4sufgFl4eoeGPo8NDtP5pXKRbikDugkDtYcNX7K5lr88/Ziz paQmP944HomdW3JtKZY95p83rYB44DmMfA== X-Google-Smtp-Source: AA0mqf56aYrtGEI5T12yTuu0My9b29uNyhfqb9Qrovt/vAcd27BaIcPBAA5rlaYbkaxxGF+NO1qpnQ== X-Received: by 2002:a05:620a:150c:b0:6f8:aafe:27e7 with SMTP id i12-20020a05620a150c00b006f8aafe27e7mr29688448qkk.590.1669665711958; Mon, 28 Nov 2022 12:01:51 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1004]) by smtp.gmail.com with ESMTPSA id fy15-20020a05622a5a0f00b0039cc64bcb53sm7431518qtb.27.2022.11.28.12.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 12:01:51 -0800 (PST) From: Maxim Cournoyer Date: Mon, 28 Nov 2022 15:01:43 -0500 Message-Id: <20221128200145.9078-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): 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, 18 insertions(+), 20 deletions(-) base-commit: 059d38dc3f8b087f4a42df586daeb05761ee18d7 diff --git a/gnu/system.scm b/gnu/system.scm index 3478afcec4..3241a18288 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -49,9 +49,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) @@ -180,7 +177,6 @@ (define-module (gnu system) %base-packages-interactive %base-packages-linux %base-packages-networking - %base-packages-disk-utilities %base-packages-utils %base-firmware %default-kernel-arguments)) @@ -896,21 +892,6 @@ (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 %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. 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")