gnu: Add 'inputs' field to <user-account>; make 'shell' a monadic value.

* gnu/system/shadow.scm (<user-account>)[inputs]: New field.
  (passwd-file): Bind the 'shell' field of each account.
* gnu/system/vm.scm (%demo-operating-system): Remove 'shell' field.
* gnu/system/dmd.scm (guix-build-accounts): Store a monadic value in
  'shell'.  Add 'inputs' field.
* gnu/system.scm (operating-system-derivation): Remove 'shell' field for
  'root' account.  Add all the 'user-account-inputs' to EXTRAS.

1 files changed, 5 insertions, 6 deletions

diff --git a/gnu/system.scm b/gnu/system.scm
index 79d87855f6..c6b67a7a1c 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -281,8 +281,7 @@ alias ll='ls -l'
                             (password "")
                             (uid 0) (gid 0)
                             (comment "System administrator")
-                            (home-directory "/")
-                            (shell bash-file))
+                            (home-directory "/"))
                           (append (operating-system-users os)
                                   (append-map service-user-accounts
                                               services))))
@@ -320,22 +319,22 @@ alias ll='ls -l'
                            (initrd initrd))))
        (grub.cfg (grub-configuration-file entries))
        (extras   (links (delete-duplicates
-                         (append-map service-inputs services)))))
+                         (append (append-map service-inputs services)
+                                 (append-map user-account-inputs accounts))))))
     (file-union `(("boot" ,boot)
                   ("kernel" ,kernel-dir)
                   ("initrd" ,initrd-file)
                   ("dmd.conf" ,dmd-conf)
-                  ("bash" ,bash-file) ; XXX: should be a <user-account> input?
                   ("profile" ,profile)
                   ("grub.cfg" ,grub.cfg)
                   ("etc" ,etc)
-                  ("service-inputs" ,(derivation->output-path extras)))
+                  ("system-inputs" ,(derivation->output-path extras)))
                 #:inputs `(("kernel" ,kernel)
                            ("initrd" ,initrd)
                            ("bash" ,bash)
                            ("profile" ,profile-drv)
                            ("etc" ,etc-drv)
-                           ("service-inputs" ,extras))
+                           ("system-inputs" ,extras))
                 #:name "system")))
 
 ;;; system.scm ends here