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".

1 files changed, 30 insertions, 28 deletions

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 317800db50..5522541735 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -20,6 +20,7 @@
   #:use-module (gnu services)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages linux)
+  #:use-module (guix gexp)
   #:use-module (guix monads)
   #:export (static-networking-service))
 
@@ -41,40 +42,41 @@ true, it must be a string specifying the default network gateway."
   ;; TODO: Eventually we should do this using Guile's networking procedures,
   ;; like 'configure-qemu-networking' does, but the patch that does this is
   ;; not yet in stock Guile.
-  (mlet %store-monad ((ifconfig (package-file inetutils "bin/ifconfig"))
-                      (route    (package-file net-tools "sbin/route")))
+  (with-monad %store-monad
     (return
      (service
       (documentation
        (string-append "Set up networking on the '" interface
                       "' interface using a static IP address."))
       (provision '(networking))
-      (start `(lambda _
-                ;; Return #t if successfully started.
-                (and (zero? (system* ,ifconfig ,interface ,ip "up"))
-                     ,(if gateway
-                          `(zero? (system* ,route "add" "-net" "default"
-                                           "gw" ,gateway))
-                          #t)
-                     ,(if (pair? name-servers)
-                          `(call-with-output-file "/etc/resolv.conf"
-                             (lambda (port)
-                               (display
-                                "# Generated by 'static-networking-service'.\n"
-                                port)
-                               (for-each (lambda (server)
-                                           (format port "nameserver ~a~%"
-                                                   server))
-                                         ',name-servers)))
-                          #t))))
-      (stop  `(lambda _
+      (start #~(lambda _
+                 ;; Return #t if successfully started.
+                 (and (zero? (system* (string-append #$inetutils
+                                                     "/bin/ifconfig")
+                                      #$interface #$ip "up"))
+                      #$(if gateway
+                            #~(zero? (system* (string-append #$net-tools
+                                                             "/sbin/route")
+                                              "add" "-net" "default"
+                                              "gw" #$gateway))
+                            #t)
+                      #$(if (pair? name-servers)
+                            #~(call-with-output-file "/etc/resolv.conf"
+                                (lambda (port)
+                                  (display
+                                   "# Generated by 'static-networking-service'.\n"
+                                   port)
+                                  (for-each (lambda (server)
+                                              (format port "nameserver ~a~%"
+                                                      server))
+                                            '#$name-servers)))
+                            #t))))
+      (stop #~(lambda _
                 ;; Return #f is successfully stopped.
-                (not (and (system* ,ifconfig ,interface "down")
-                          (system* ,route "del" "-net" "default")))))
-      (respawn? #f)
-      (inputs `(("inetutils" ,inetutils)
-                ,@(if gateway
-                      `(("net-tools" ,net-tools))
-                      '())))))))
+                (not (and (system* (string-append #$inetutils "/sbin/ifconfig")
+                                   #$interface "down")
+                          (system* (string-append #$net-tools "/sbin/route")
+                                   "del" "-net" "default")))))
+      (respawn? #f)))))
 
 ;;; networking.scm ends here