summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-12-09 23:45:27 +0100
committerLudovic Courtès <ludo@gnu.org>2013-12-10 00:24:02 +0100
commit4f62d8d6c74d1d9cec049cb5e22452b8d78655f5 (patch)
tree8d0f132041280fabc3711138c76cb91e228703a5 /gnu/system
parent78ed003811a38a7a3de56316755a2808b7d87e45 (diff)
downloadguix-4f62d8d6c74d1d9cec049cb5e22452b8d78655f5.tar.gz
gnu: Allow a plain list of packages in 'operating-system'.
* gnu/system.scm (union): Allow (PACKAGE OUTPUT), (PACKAGE), and
  PACKAGE.
  (<operating-system>)[packages]: Make the default a list of package?
  objects.
* gnu/system/vm.scm (%demo-operating-system): Likewise.  Add a few
  packages.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm33
1 files changed, 19 insertions, 14 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 8a490fbd6c..a81c84672b 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -25,9 +25,11 @@
   #:use-module ((gnu packages base)
                 #:select (%final-inputs
                           guile-final gcc-final glibc-final
+                          ld-wrapper binutils-final
                           coreutils findutils grep sed))
   #:use-module (gnu packages guile)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages less)
   #:use-module (gnu packages qemu)
   #:use-module (gnu packages parted)
   #:use-module (gnu packages zile)
@@ -416,20 +418,23 @@ such as /etc files."
                  (uid 1000) (gid 100)
                  (comment "Guest of GNU")
                  (home-directory "/home/guest"))))
-   (packages `(("coreutils" ,coreutils)
-               ("bash" ,bash)
-               ("guile" ,guile-2.0)
-               ("dmd" ,dmd)
-               ("gcc" ,gcc-final)
-               ("libc" ,glibc-final)
-               ("inetutils" ,inetutils)
-               ("findutils" ,findutils)
-               ("grep" ,grep)
-               ("sed" ,sed)
-               ("procps" ,procps)
-               ("psmisc" ,psmisc)
-               ("zile" ,zile)
-               ("guix" ,guix)))))
+   (packages (list coreutils
+                   bash
+                   guile-2.0
+                   dmd
+                   gcc-final
+                   ld-wrapper                    ; must come before BINUTILS
+                   binutils-final
+                   glibc-final
+                   inetutils
+                   findutils
+                   grep
+                   sed
+                   procps
+                   psmisc
+                   zile
+                   less
+                   guix))))
 
 (define* (system-qemu-image #:optional (os %demo-operating-system))
   "Return the derivation of a QEMU image of the GNU system."