nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Ludovic Courtès 2013-12-09 23:45:27 +01:00
parent 78ed003811
commit 4f62d8d6c7
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/system.scm
View File

@ -78,12 +78,14 @@
(members '("guest")))))) (members '("guest"))))))
(packages operating-system-packages ; list of (PACKAGE OUTPUT...) (packages operating-system-packages ; list of (PACKAGE OUTPUT...)
(default `(("coreutils" ,coreutils) (default (list coreutils ; or just PACKAGE
("grep" ,grep) grep
("guile" ,guile) sed
("bash" ,bash) findutils
("dmd" ,(@ (gnu packages dmd) dmd)) guile
("guix" ,guix)))) bash
(@ (gnu packages dmd) dmd)
guix)))
(timezone operating-system-timezone) ; string (timezone operating-system-timezone) ; string
(locale operating-system-locale) ; string (locale operating-system-locale) ; string
@ -134,11 +136,11 @@ input tuples."
(mlet %store-monad (mlet %store-monad
((inputs (sequence %store-monad ((inputs (sequence %store-monad
(map (match-lambda (map (match-lambda
((name (? package? p)) ((or ((? package? p)) (? package? p))
(mlet %store-monad (mlet %store-monad
((drv (package->derivation p system))) ((drv (package->derivation p system)))
(return `(,name ,drv)))) (return `(,name ,drv))))
((name (? package? p) output) (((? package? p) output)
(mlet %store-monad (mlet %store-monad
((drv (package->derivation p system))) ((drv (package->derivation p system)))
(return `(,name ,drv ,output)))) (return `(,name ,drv ,output))))

33
gnu/system/vm.scm
View File

@ -25,9 +25,11 @@
#:use-module ((gnu packages base) #:use-module ((gnu packages base)
#:select (%final-inputs #:select (%final-inputs
guile-final gcc-final glibc-final guile-final gcc-final glibc-final
ld-wrapper binutils-final
coreutils findutils grep sed)) coreutils findutils grep sed))
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages less)
#:use-module (gnu packages qemu) #:use-module (gnu packages qemu)
#:use-module (gnu packages parted) #:use-module (gnu packages parted)
#:use-module (gnu packages zile) #:use-module (gnu packages zile)
@ -416,20 +418,23 @@ such as /etc files."
(uid 1000) (gid 100) (uid 1000) (gid 100)
(comment "Guest of GNU") (comment "Guest of GNU")
(home-directory "/home/guest")))) (home-directory "/home/guest"))))
(packages `(("coreutils" ,coreutils) (packages (list coreutils
("bash" ,bash) bash
("guile" ,guile-2.0) guile-2.0
("dmd" ,dmd) dmd
("gcc" ,gcc-final) gcc-final
("libc" ,glibc-final) ld-wrapper ; must come before BINUTILS
("inetutils" ,inetutils) binutils-final
("findutils" ,findutils) glibc-final
("grep" ,grep) inetutils
("sed" ,sed) findutils
("procps" ,procps) grep
("psmisc" ,psmisc) sed
("zile" ,zile) procps
("guix" ,guix))))) psmisc
zile
less
guix))))
(define* (system-qemu-image #:optional (os %demo-operating-system)) (define* (system-qemu-image #:optional (os %demo-operating-system))
"Return the derivation of a QEMU image of the GNU system." "Return the derivation of a QEMU image of the GNU system."