diff options
author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/services/desktop.scm | |
parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
download | guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/services/desktop.scm')
-rw-r--r-- | gnu/services/desktop.scm | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 265cf9f35f..cd800fcc2b 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -82,7 +82,6 @@ upower-configuration-time-action upower-configuration-critical-power-action - upower-service upower-service-type udisks-configuration @@ -91,7 +90,6 @@ udisks-service-type colord-service-type - colord-service geoclue-application geoclue-configuration @@ -285,37 +283,6 @@ used by GNOME.") upower-package))) (default-value (upower-configuration))))) -(define-deprecated (upower-service #:key (upower upower) - (watts-up-pro? #f) - (poll-batteries? #t) - (ignore-lid? #f) - (use-percentage-for-policy? #f) - (percentage-low 10) - (percentage-critical 3) - (percentage-action 2) - (time-low 1200) - (time-critical 300) - (time-action 120) - (critical-power-action 'hybrid-sleep)) - upower-service-type - "Return a service that runs @uref{http://upower.freedesktop.org/, -@command{upowerd}}, a system-wide monitor for power consumption and battery -levels, with the given configuration settings. It implements the -@code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME." - (let ((config (upower-configuration - (watts-up-pro? watts-up-pro?) - (poll-batteries? poll-batteries?) - (ignore-lid? ignore-lid?) - (use-percentage-for-policy? use-percentage-for-policy?) - (percentage-low percentage-low) - (percentage-critical percentage-critical) - (percentage-action percentage-action) - (time-low time-low) - (time-critical time-critical) - (time-action time-action) - (critical-power-action critical-power-action)))) - (service upower-service-type config))) - ;;; ;;; GeoClue D-Bus service. @@ -540,15 +507,6 @@ Users need to be in the @code{lp} group to access the D-Bus service. interface to manage the color profiles of input and output devices such as screens and scanners."))) -(define-deprecated (colord-service #:key (colord colord)) - colord-service-type - "Return a service that runs @command{colord}, a system service with a D-Bus -interface to manage the color profiles of input and output devices such as -screens and scanners. It is notably used by the GNOME Color Manager graphical -tool. See @uref{http://www.freedesktop.org/software/colord/, the colord web -site} for more information." - (service colord-service-type colord)) - ;;; ;;; UDisks. |