Ludovic Courtès (2015-09-02 23:18 +0300) wrote:
> Alex Kost <alez...@gmail.com> skribis:
[...]
>> We have ‘bash-light’ and ‘wpa-supplicant-light’; ‘bioperl-minimal’ and
>> ‘cups-minimal’. I think we should stick to a single name for such
>> light/minimal packages. (I prefer "…-minimal")
>
> Right, I realized I hadn’t made up my mind. “Minimal” is probably
> preferable, indeed. Let’s rename and bash-light in core-updates, and
> wpa-supplicant-light in master.
OK, the patches for both are attached.
>From e040b70e23f04fca1c91123751ce8b6e28719bb8 Mon Sep 17 00:00:00 2001
From: Alex Kost <alez...@gmail.com>
Date: Thu, 3 Sep 2015 11:12:28 +0300
Subject: [PATCH] gnu: bash-light: Rename to bash-minimal.
* gnu/packages/bash.scm (bash-light): Rename to ...
(bash-minimal): ...this.
(static-bash): Use it.
* gnu/packages/make-bootstrap.scm (%bash-static): Use it.
---
gnu/packages/bash.scm | 6 +++---
gnu/packages/make-bootstrap.scm | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index fcfa337..180c64e 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -214,10 +214,10 @@ without modification.")
(license gpl3+)
(home-page "http://www.gnu.org/software/bash/";))))
-(define-public bash-light
+(define-public bash-minimal
;; A stripped-down Bash for non-interactive use.
(package (inherit bash)
- (name "bash-light")
+ (name "bash-minimal")
(inputs '()) ; no readline, no curses
(arguments
(let ((args `(#:modules ((guix build gnu-build-system)
@@ -242,7 +242,7 @@ without modification.")
(define-public static-bash
;; Statically-linked Bash that contains nothing but the 'bash' binary and
;; 'sh' symlink, without any reference.
- (let ((bash (static-package bash-light)))
+ (let ((bash (static-package bash-minimal)))
(package
(inherit bash)
(name "bash-static")
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 904aaed..8923faf 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -115,7 +115,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
#:native-inputs native-inputs))
(define %bash-static
- (static-package bash-light))
+ (static-package bash-minimal))
(define %static-inputs
;; Packages that are to be used as %BOOTSTRAP-INPUTS.
--
2.5.1
>From 3deea5ea0cc104993ab665863105d7ad672f5ea0 Mon Sep 17 00:00:00 2001
From: Alex Kost <alez...@gmail.com>
Date: Thu, 3 Sep 2015 11:23:30 +0300
Subject: [PATCH] gnu: wpa-supplicant-light: Rename to wpa-supplicant-minimal.
* gnu/packages/admin.scm (wpa-supplicant-light): Rename to ...
(wpa-supplicant-minimal): ...this.
(wpa-supplicant): Use it.
* gnu/system/install.scm (installation-os): Use it.
---
gnu/packages/admin.scm | 10 +++++-----
gnu/system/install.scm | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 53cf65e..70b2bb2 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -703,9 +703,9 @@ commands and their arguments.")
;; See <http://www.sudo.ws/sudo/license.html>.
(license license:x11)))
-(define-public wpa-supplicant-light
+(define-public wpa-supplicant-minimal
(package
- (name "wpa-supplicant-light")
+ (name "wpa-supplicant-minimal")
(version "2.4")
(source (origin
(method url-fetch)
@@ -795,12 +795,12 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(license license:bsd-3)))
(define-public wpa-supplicant
- (package (inherit wpa-supplicant-light)
+ (package (inherit wpa-supplicant-minimal)
(name "wpa-supplicant")
(inputs `(("dbus" ,dbus)
- ,@(package-inputs wpa-supplicant-light)))
+ ,@(package-inputs wpa-supplicant-minimal)))
(arguments
- (substitute-keyword-arguments (package-arguments wpa-supplicant-light)
+ (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases)
`(alist-cons-after
'configure 'configure-for-dbus
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e7e5d4a..9314462 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -344,7 +344,7 @@ Use Alt-F2 for documentation.
parted ddrescue
grub ;mostly so xrefs to its manual work
cryptsetup
- wireless-tools iw wpa-supplicant-light iproute
+ 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
--
2.5.1
