diff options
author | Mark H Weaver <mhw@netris.org> | 2015-06-18 01:32:37 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-06-18 01:32:37 -0400 |
commit | 2abf678682c42842c16e026c51d96b1fa86be88f (patch) | |
tree | 7bd59bd08dbaf00f23f37a91d1e7ae3d7a915843 /build-aux/hydra | |
parent | 9ae1e920718e95577c12de890754b6a6a4ff70a1 (diff) | |
parent | c362a40a5825faafc76b72f69fb6595fa29d3f60 (diff) | |
download | guix-2abf678682c42842c16e026c51d96b1fa86be88f.tar guix-2abf678682c42842c16e026c51d96b1fa86be88f.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux/hydra')
-rw-r--r-- | build-aux/hydra/demo-os.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm index d96cdce496..95950cacb1 100644 --- a/build-aux/hydra/demo-os.scm +++ b/build-aux/hydra/demo-os.scm @@ -22,22 +22,14 @@ ;;; machine images that we build. ;;; -(use-modules (gnu) - - (gnu packages xorg) - (gnu packages avahi) - (gnu packages linux) - (gnu packages tor) - - (gnu services networking) - (gnu services avahi) - (gnu services dbus) - (gnu services xorg)) +(use-modules (gnu)) +(use-service-modules desktop xorg networking avahi) +(use-package-modules linux xorg tor avahi) (operating-system (host-name "gnu") (timezone "Europe/Paris") - (locale "en_US.utf8") + (locale "en_US.UTF-8") (bootloader (grub-configuration (device "/dev/sda"))) |