diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-04 14:59:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-04 18:15:50 +0200 |
| commit | 6f436c54d6d9698e62639de31a845cd9b9167423 (patch) | |
| tree | 24e4d42578e85a24bb5493dfe23a5e04bacab2eb /build-aux | |
| parent | 39d4fde3bfd27607980eb58f0b17b837953b1e4c (diff) | |
| download | guix-6f436c54d6d9698e62639de31a845cd9b9167423.tar guix-6f436c54d6d9698e62639de31a845cd9b9167423.tar.gz | |
system: Define '%base-packages' and use it.
* gnu/system.scm (<operating-system>)[packages]: Change default value to
%BASE-PACKAGES.
(%base-packages): New variable.
* gnu/system/install.scm (installation-os): Use it when defining the
'packages' field.
* doc/guix.texi (Using the Configuration System): Use %BASE-PACKAGES in
example. Remove now unneeded module imports. Explain this.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/demo-os.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm index 0b41ec901f..bb8cd05fc2 100644 --- a/build-aux/hydra/demo-os.scm +++ b/build-aux/hydra/demo-os.scm @@ -24,15 +24,7 @@ (use-modules (gnu) - (gnu packages zile) (gnu packages xorg) - (gnu packages admin) - (gnu packages guile) - (gnu packages bash) - (gnu packages linux) - (gnu packages less) - (gnu packages tor) - (gnu packages package-management) (gnu packages avahi) (gnu services networking) @@ -98,7 +90,5 @@ You can log in as 'guest' or 'root' with no password. (pam-services ;; Explicitly allow for empty passwords. (base-pam-services #:allow-empty-passwords? #t)) - (packages (list bash coreutils findutils grep sed - procps psmisc less - guile-2.0 dmd guix util-linux inetutils avahi - xterm zile))) + + (packages (cons* xterm avahi %base-packages))) |