From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KFGZAbVqgF+yBwAA0tVLHw (envelope-from ) for ; Fri, 09 Oct 2020 13:50:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iM7tOLRqgF+1agAAB5/wlQ (envelope-from ) for ; Fri, 09 Oct 2020 13:50:44 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 889D594053D for ; Fri, 9 Oct 2020 13:50:43 +0000 (UTC) Received: from localhost ([::1]:37424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQsnB-0001pe-Uh for larch@yhetil.org; Fri, 09 Oct 2020 09:50:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQsih-0007Jm-1R for guix-patches@gnu.org; Fri, 09 Oct 2020 09:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51090) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kQsig-0001ar-Lt for guix-patches@gnu.org; Fri, 09 Oct 2020 09:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kQsig-0004cA-If for guix-patches@gnu.org; Fri, 09 Oct 2020 09:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43881] [PATCH 2/2] install: Deduplicate packages with %base-package sets. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Oct 2020 13:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43881@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 43881-submit@debbugs.gnu.org id=B43881.160225112617686 (code B ref 43881); Fri, 09 Oct 2020 13:46:02 +0000 Received: (at 43881) by debbugs.gnu.org; 9 Oct 2020 13:45:26 +0000 Received: from localhost ([127.0.0.1]:34403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQsi6-0004bC-Bl for submit@debbugs.gnu.org; Fri, 09 Oct 2020 09:45:26 -0400 Received: from flashner.co.il ([178.62.234.194]:41762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQsi2-0004au-Id for 43881@debbugs.gnu.org; Fri, 09 Oct 2020 09:45:24 -0400 Received: from localhost (unknown [141.226.15.20]) by flashner.co.il (Postfix) with ESMTPSA id B0BF2403D2; Fri, 9 Oct 2020 13:45:16 +0000 (UTC) From: Efraim Flashner Date: Fri, 9 Oct 2020 16:42:53 +0300 Message-Id: <20201009134253.26375-2-efraim@flashner.co.il> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009134253.26375-1-efraim@flashner.co.il> References: <20201009134253.26375-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: ADoAUooWUfn/ * gnu/system.scm (%base-packages-interactive): Add nvi. * gnu/system/install.scm (installation-os)[packages]: Remove parted, gptfdisk, ddrescue, cryptsetup, mdadm, dosfstools, btrfs-progs, f2fs-tools, jfstools, openssh, wireless-tools, iw, wpa-supplicant-minimal, iproute, bash-completion, nvi. Replace glibc with the canonical-package of glibc. Add %base-packages-disk-utils. remove wpa-supplicant-minimal replace glibc with canonical-pacakge glibc --- gnu/system.scm | 2 ++ gnu/system/install.scm | 37 ++++++++++--------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index b10e94b95b..3bc89e0a31 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages nano) + #:use-module (gnu packages nvi) #:use-module (gnu packages package-management) #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) @@ -713,6 +714,7 @@ of PROVENANCE-SERVICE-TYPE to its services." (define %base-packages-interactive ;; Default set of common interactive packages. (list less zile nano + nvi man-db info-reader ;the standalone Info reader (no Perl) bash-completion diff --git a/gnu/system/install.scm b/gnu/system/install.scm index be5a678cec..0af9e2993d 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,18 +42,13 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) - #:use-module (gnu packages file-systems) + #:use-module (gnu packages compression) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) #:use-module (gnu packages linux) - #:use-module (gnu packages ssh) - #:use-module (gnu packages cryptsetup) #:use-module (gnu packages package-management) - #:use-module (gnu packages disk) #:use-module (gnu packages texinfo) - #:use-module (gnu packages compression) - #:use-module (gnu packages nvi) #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-26) @@ -490,27 +486,14 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Explicitly allow for empty passwords. (base-pam-services #:allow-empty-passwords? #t)) - (packages (cons* glibc ;for 'tzselect' & co. - parted gptfdisk ddrescue - fontconfig - font-dejavu font-gnu-unifont - grub ;mostly so xrefs to its manual work - cryptsetup - mdadm - dosfstools ;mkfs.fat, for the UEFI boot partition - btrfs-progs - f2fs-tools - jfsutils - openssh ;we already have sshd, having ssh/scp can help - wireless-tools iw wpa-supplicant-minimal iproute - ;; XXX: We used to have GNU fdisk here, but as of version - ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable - ;; space; furthermore util-linux's fdisk is already - ;; available here, so we keep that. - bash-completion - nvi ;:wq! - nss-certs ; To access HTTPS, use git, etc. - %base-packages)))) + (packages (append + (list (canonical-package glibc) ; for 'tzselect' & co. + fontconfig + font-dejavu font-gnu-unifont + grub ; mostly so xrefs to its manual work + nss-certs) ; To access HTTPS, use git, etc. + %base-packages-disk-utils + %base-packages)))) (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") (triplet "arm-linux-gnueabihf")) -- 2.28.0