Merge branch 'master' into core-updates

Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.

12 files changed, 82 insertions, 10 deletions

diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 562005c22c..807cc05a22 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -26,7 +26,8 @@
   #:use-module (gnu packages admin)
   #:use-module (guix records)
   #:use-module (guix gexp)
-  #:export (avahi-service
+  #:export (avahi-configuration
+            avahi-service
             avahi-service-type))
 
 ;;; Commentary:
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 805ba7d12c..4474ce7996 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -94,11 +94,17 @@
             guix-publish-configuration?
             guix-publish-service
             guix-publish-service-type
+
+            gpm-configuration
+            gpm-configuration?
             gpm-service-type
             gpm-service
 
             urandom-seed-service-type
             urandom-seed-service
+
+            rngd-configuration
+            rngd-configuration?
             rngd-service-type
             rngd-service
             pam-limits-service-type
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index e136d1e00b..86847f8c50 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -27,9 +27,15 @@
   #:use-module (guix records)
   #:use-module (guix gexp)
   #:use-module (ice-9 match)
-  #:export (postgresql-service
+  #:export (postgresql-configuration
+            postgresql-configuration?
+            postgresql-service
+            postgresql-service-type
+
             mysql-service
-            mysql-configuration))
+            mysql-service-type
+            mysql-configuration
+            mysql-configuration?))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 6ef13568ef..690561cccd 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -27,7 +27,9 @@
   #:use-module (guix records)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
-  #:export (dbus-root-service-type
+  #:export (dbus-configuration
+            dbus-configuration?
+            dbus-root-service-type
             dbus-service))
 
 ;;;
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 86214a73bf..bf21707bfe 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -45,18 +45,47 @@
   #:use-module (guix gexp)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
-  #:export (upower-service
+  #:export (upower-configuration
+            upower-configuration?
+            upower-service
+            upower-service-type
+
+            udisks-configuration
+            udisks-configuration?
             udisks-service
+            udisks-service-type
+
             colord-service
+
             geoclue-application
+            geoclue-configuration
+            geoclue-configuration?
             %standard-geoclue-applications
             geoclue-service
+            geoclue-service-type
+
             bluetooth-service
+
+            polkit-configuration
+            polkit-configuration?
             polkit-service
+            polkit-service-type
+
             elogind-configuration
+            elogind-configuration?
             elogind-service
+            elogind-service-type
+
+            gnome-desktop-configuration
+            gnome-desktop-configuration?
             gnome-desktop-service
+            gnome-desktop-service-type
+
+            xfce-desktop-configuration
+            xfce-desktop-configuration?
             xfce-desktop-service
+            xfce-desktop-service-type
+
             %desktop-services))
 
 ;;; Commentary:
diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 9c06d5713a..b06922c911 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -30,6 +30,7 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
   #:export (dicod-service
+            dicod-service-type
             dicod-configuration
             dicod-database
             %dicod-database:gcide))
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index 069084abf6..e95f54280d 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,7 +24,10 @@
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (ice-9 match)
-  #:export (lirc-service))
+  #:export (lirc-configuration
+            lirc-configuation?
+            lirc-service
+            lirc-service-type))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 4bd1b96b56..c252d669de 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -37,6 +37,7 @@
             dovecot-configuration-error?
 
             dovecot-service
+            dovecot-service-type
             dovecot-configuration
             opaque-dovecot-configuration
 
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index a77ed3bb80..71f49a03a5 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -39,13 +39,28 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
   #:export (%facebook-host-aliases
+            static-networking
             static-networking-service
+            static-networking-service-type
             dhcp-client-service
             %ntp-servers
+
+            ntp-configuration
+            ntp-configuration?
             ntp-service
+            ntp-service-type
+
+            tor-configuration
+            tor-configuration?
             tor-hidden-service
             tor-service
+            tor-service-type
+
+            bitlbee-configuration
+            bitlbee-configuration?
             bitlbee-service
+            bitlbee-service-type
+
             wicd-service
             network-manager-service
             connman-service))
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 743b5e3805..9a7ea0fb46 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -25,7 +25,10 @@
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (srfi srfi-26)
-  #:export (lsh-service
+  #:export (lsh-configuration
+            lsh-configuration?
+            lsh-service
+            lsh-service-type
 
             dropbear-configuration
             dropbear-configuration?
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 72ef7d4050..d86aab50b5 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -27,7 +27,10 @@
   #:use-module (guix records)
   #:use-module (guix gexp)
   #:use-module (ice-9 match)
-  #:export (nginx-service))
+  #:export (nginx-configuration
+            nginx-configuration?
+            nginx-service
+            nginx-service-type))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 44d12a7e77..905c88ff66 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -48,6 +48,8 @@
             slim-service-type
             slim-service
 
+            screen-locker
+            screen-locker?
             screen-locker-service-type
             screen-locker-service))