From b5f4e686359d8842b329e6b161ef89fa6c04ebc3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 28 Apr 2014 23:07:08 +0200
Subject: services: Rewrite using gexps.

* gnu/services.scm (<service>)[inputs]: Remove.
* gnu/system.scm (links): Remove.
  (etc-directory): Add PASSWD and SHADOW to #:inputs.
  (operating-system-boot-script): Pass ETC to 'dmd-configuration-file'.
  (operating-system-derivation): Remove EXTRAS from the union.
* gnu/system/linux.scm (pam-service->configuration): Rewrite in terms of
  'gexp->derivation'.  Compute the contents on the build side.  Expect
  'arguments' to contain a list of gexps.
  (pam-services->directory): Rewrite in terms of 'gexp->derivation'.
  (unix-pam-service): Change 'arguments' to a list of one gexp.
* gnu/system/shadow.scm (<user-account>)[inputs]: Remove.
  [shell]: Change default value to a gexp.
  (passwd-file): Rewrite in terms of 'gexp->derivation'.  Compute
  contents on the build side.
* gnu/services/base.scm (host-name-service, mingetty-service,
  nscd-service, syslog-service, guix-service): Change 'start' and 'stop'
  to gexps; remove 'inputs' field.
  (guix-build-accounts): Change 'shell' field to a gexp.
* gnu/services/networking.scm (static-networking-service): Change
  'start' and 'stop' to gexps; remove 'inputs' field.
* gnu/services/xorg.scm (slim-service): Likewise.
* gnu/services/dmd.scm (dmd-configuration-file): Expect ETC to be a
  derivation.  Change 'config' to a gexp.  Use 'gexp->file' instead of
  'text-file'.
* doc/guix.texi (Defining Services): Update nscd example with gexps, and
  without 'inputs'.  Add xref to "G-Expressions".
---
 gnu/system.scm | 44 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

(limited to 'gnu/system.scm')

diff --git a/gnu/system.scm b/gnu/system.scm
index 65b524d387..20c49c182a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -192,29 +192,6 @@ as an inputs; additional inputs, such as derivations, are taken from INPUTS."
                              #:inputs inputs
                              #:local-build? #t))))
 
-(define (links inputs)
-  "Return a directory with symbolic links to all of INPUTS.  This is
-essentially useful when one wants to keep references to all of INPUTS, be they
-directories or regular files."
-  (define builder
-    '(begin
-       (use-modules (srfi srfi-1))
-
-       (let ((out (assoc-ref %outputs "out")))
-         (mkdir out)
-         (chdir out)
-         (fold (lambda (file number)
-                 (symlink file (number->string number))
-                 (+ 1 number))
-               0
-               (map cdr %build-inputs))
-         #t)))
-
-  (mlet %store-monad ((inputs (lower-inputs inputs)))
-    (derivation-expression "links" builder
-                           #:inputs inputs
-                           #:local-build? #t)))
-
 (define* (etc-directory #:key
                         (locale "C") (timezone "Europe/Paris")
                         (accounts '())
@@ -272,12 +249,14 @@ alias ll='ls -l'
                    ("shells" ,shells)
                    ("profile" ,(derivation->output-path bashrc))
                    ("localtime" ,tz-file)
-                   ("passwd" ,passwd)
-                   ("shadow" ,shadow)
+                   ("passwd" ,(derivation->output-path passwd))
+                   ("shadow" ,(derivation->output-path shadow))
                    ("group" ,group))))
     (file-union files
                 #:inputs `(("net" ,net-base)
                            ("pam.d" ,pam.d)
+                           ("passwd" ,passwd)
+                           ("shadow" ,shadow)
                            ("bashrc" ,bashrc)
                            ("tzdata" ,tzdata))
                 #:name "etc")))
@@ -327,8 +306,7 @@ we're running in the final root."
   (mlet* %store-monad
       ((services (sequence %store-monad (operating-system-services os)))
        (etc      (operating-system-etc-directory os))
-       (dmd-conf (dmd-configuration-file services
-                                         (derivation->output-path etc))))
+       (dmd-conf (dmd-configuration-file services etc)))
     (gexp->file "boot"
                 #~(execl (string-append #$dmd "/bin/dmd")
                          "dmd" "--config" #$dmd-conf))))
@@ -357,25 +335,19 @@ we're running in the final root."
                            (linux-arguments `("--root=/dev/sda1"
                                               ,(string-append "--load=" boot)))
                            (initrd initrd-file))))
-       (grub.cfg (grub-configuration-file entries))
-       (accounts (operating-system-accounts os))
-       (extras   (links (delete-duplicates
-                         (append (append-map service-inputs services)
-                                 (append-map user-account-inputs accounts))))))
+       (grub.cfg (grub-configuration-file entries)))
     (file-union `(("boot" ,boot)
                   ("kernel" ,kernel-dir)
                   ("initrd" ,initrd-file)
                   ("profile" ,profile)
                   ("grub.cfg" ,grub.cfg)
-                  ("etc" ,etc)
-                  ("system-inputs" ,(derivation->output-path extras)))
+                  ("etc" ,etc))
                 #:inputs `(("boot" ,boot-drv)
                            ("kernel" ,kernel)
                            ("initrd" ,initrd)
                            ("bash" ,bash)
                            ("profile" ,profile-drv)
-                           ("etc" ,etc-drv)
-                           ("system-inputs" ,extras))
+                           ("etc" ,etc-drv))
                 #:name "system")))
 
 ;;; system.scm ends here
-- 
cgit v1.2.3