aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-06-18 01:29:29 -0400
committerMark H Weaver <mhw@netris.org>2015-06-18 01:32:20 -0400
commitc362a40a5825faafc76b72f69fb6595fa29d3f60 (patch)
tree56dfc8837271950b28a55f3a6e042a8d5a391a20
parent040ca34f7e7a9eff51363b72aad62cbcb3ad5b20 (diff)
downloadguix-c362a40a5825faafc76b72f69fb6595fa29d3f60.tar
guix-c362a40a5825faafc76b72f69fb6595fa29d3f60.tar.gz
hydra: Fix the demo OS.
* build-aux/hydra/demo-os.scm: Don't try to import (gnu services dbus), which no longer exists. Use 'use-service-modules' and 'use-package-modules'. Use "en_US.UTF-8" as system locale.
-rw-r--r--build-aux/hydra/demo-os.scm16
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")))