01/01: hydra: Fix the demo OS.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit c362a40a5825faafc76b72f69fb6595fa29d3f60
Author: Mark H Weaver <address@hidden>
Date:   Thu Jun 18 01:29:29 2015 -0400

    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 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm
index d96cdce4..95950ca 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")))