From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: '-light' vs. '-minimal' packages Date: Thu, 03 Sep 2015 11:32:48 +0300 Message-ID: <87k2s7gaxb.fsf@gmail.com> References: <87613v43kv.fsf@gnu.org> <87a8t64ph1.fsf@elephly.net> <871teh9ddz.fsf_-_@gnu.org> <87y4goy88h.fsf_-_@gmail.com> <87vbbs60e5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXPwu-0005Di-Jv for guix-devel@gnu.org; Thu, 03 Sep 2015 04:32:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXPwq-0005ct-6r for guix-devel@gnu.org; Thu, 03 Sep 2015 04:32:48 -0400 In-Reply-To: <87vbbs60e5.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 02 Sep 2015 22:18:10 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s (2015-09-02 23:18 +0300) wrote: > Alex Kost skribis: [...] >> We have =E2=80=98bash-light=E2=80=99 and =E2=80=98wpa-supplicant-light= =E2=80=99; =E2=80=98bioperl-minimal=E2=80=99 and >> =E2=80=98cups-minimal=E2=80=99. I think we should stick to a single nam= e for such >> light/minimal packages. (I prefer "=E2=80=A6-minimal") > > Right, I realized I hadn=E2=80=99t made up my mind. =E2=80=9CMinimal=E2= =80=9D is probably > preferable, indeed. Let=E2=80=99s rename and bash-light in core-updates,= and > wpa-supplicant-light in master. OK, the patches for both are attached. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-bash-light-Rename-to-bash-minimal.patch >From e040b70e23f04fca1c91123751ce8b6e28719bb8 Mon Sep 17 00:00:00 2001 From: Alex Kost 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 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-wpa-supplicant-light-Rename-to-wpa-supplicant-mi.patch >From 3deea5ea0cc104993ab665863105d7ad672f5ea0 Mon Sep 17 00:00:00 2001 From: Alex Kost 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 . (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 --=-=-=--