diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /gnu/services/desktop.scm | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz | |
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.
Diffstat (limited to 'gnu/services/desktop.scm')
| -rw-r--r-- | gnu/services/desktop.scm | 31 |
1 files changed, 30 insertions, 1 deletions
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: |