aboutsummaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-01 16:54:45 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-01 16:54:45 +0100
commit450fb5a6b44f05dbaa35daf2b696dfc4d502be96 (patch)
treeceeba494b1d8b09d4dce1dd9e0fed37105cbb4be /distro
parentb2adb3ae04ce2b0e383b6c4a0b78c7e885350d7a (diff)
downloadguix-450fb5a6b44f05dbaa35daf2b696dfc4d502be96.tar
guix-450fb5a6b44f05dbaa35daf2b696dfc4d502be96.tar.gz
distro: Move lightweight Bash to (distro packages bash).
* distro/packages/make-bootstrap.scm (%bash-static): Move BASH-LIGHT to... * distro/packages/bash.scm (bash-light): ... here. New variable.
Diffstat (limited to 'distro')
-rw-r--r--distro/packages/bash.scm21
-rw-r--r--distro/packages/make-bootstrap.scm21
2 files changed, 23 insertions, 19 deletions
diff --git a/distro/packages/bash.scm b/distro/packages/bash.scm
index f32293d82f..429a683920 100644
--- a/distro/packages/bash.scm
+++ b/distro/packages/bash.scm
@@ -87,3 +87,24 @@ use. In addition, most sh scripts can be run by Bash without
modification.")
(license gpl3+)
(home-page "http://www.gnu.org/software/bash/"))))
+
+(define-public bash-light
+ ;; A stripped-down Bash for non-interactive use.
+ (package (inherit bash)
+ (name "bash-light")
+ (inputs '()) ; no readline, no curses
+ (arguments
+ (let ((args `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1)
+ (srfi srfi-26))
+ ,@(package-arguments bash))))
+ (substitute-keyword-arguments args
+ ((#:configure-flags flags)
+ `(list "--without-bash-malloc"
+ "--disable-readline"
+ "--disable-history"
+ "--disable-help-builtin"
+ "--disable-progcomp"
+ "--disable-net-redirections"
+ "--disable-nls")))))))
diff --git a/distro/packages/make-bootstrap.scm b/distro/packages/make-bootstrap.scm
index 4f182da853..28be0b8c49 100644
--- a/distro/packages/make-bootstrap.scm
+++ b/distro/packages/make-bootstrap.scm
@@ -1,5 +1,5 @@
;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
-;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of Guix.
;;;
@@ -92,24 +92,7 @@
,@(fold alist-delete %final-inputs '("libc" "gcc"))))
(define %bash-static
- (let ((bash-light (package (inherit bash-final)
- (inputs '()) ; no readline, no curses
- (arguments
- (let ((args `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1)
- (srfi srfi-26))
- ,@(package-arguments bash))))
- (substitute-keyword-arguments args
- ((#:configure-flags flags)
- `(list "--without-bash-malloc"
- "--disable-readline"
- "--disable-history"
- "--disable-help-builtin"
- "--disable-progcomp"
- "--disable-net-redirections"
- "--disable-nls"))))))))
- (static-package bash-light)))
+ (static-package bash-light))
(define %static-inputs
;; Packages that are to be used as %BOOTSTRAP-INPUTS.