From c362a40a5825faafc76b72f69fb6595fa29d3f60 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Jun 2015 01:29:29 -0400 Subject: 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. --- build-aux/hydra/demo-os.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'build-aux') 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"))) -- cgit v1.2.3