This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 933ef6f5f4 services: elogind: Remove deprecated fields.
933ef6f5f4 is described below
commit 933ef6f5f4b192ae86a22db28a1d71ad5afddf35
Author: Herman Rimm <[email protected]>
AuthorDate: Thu Jul 16 15:06:05 2026 +0200
services: elogind: Remove deprecated fields.
* gnu/services/desktop.scm (elogind-deprecated-empty-serializer): Remove
variable.
(elogind-configuration): Remove deprecated fields.
* doc/guix.texi (Desktop Services): Remove descriptions for deprecated
configuration fields.
Change-Id: Ic4847d9da352671eb0dd7a7ffe507b8b5ff149e4
Signed-off-by: Maxim Cournoyer <[email protected]>
---
doc/guix.texi | 9 ---------
gnu/services/desktop.scm | 27 +--------------------------
2 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 926f5b7fe4..998e4ecff2 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27759,15 +27759,6 @@ elogind when hibernating the system.
The amount of time the system spends in suspend mode before the system
is automatically put into hibernate mode.
-@item @code{hibernate-state} (type: maybe-list-of-strings)
-Deprecated option.
-
-@item @code{hybrid-sleep-state} (type: maybe-list-of-strings)
-Deprecated option.
-
-@item @code{hybrid-sleep-mode} (type: maybe-list-of-strings)
-Deprecated option.
-
@end table
@end deftp
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 6c11664650..c9fe502431 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -1412,12 +1412,6 @@ and many other) available for GIO applications.")
(define-maybe list-of-hibernation-modes
(prefix elogind-))
-(define (elogind-deprecated-empty-serializer name value)
- (when (maybe-value-set? value)
- (warn-about-deprecation name #f
- #:replacement #f))
- "")
-
(define-maybe list-of-strings
(prefix elogind-))
@@ -1471,8 +1465,7 @@ and many other) available for GIO applications.")
;;; sleep.conf.
(define %elogind-configuration-sleep-fields
'( suspend-state suspend-mode suspend-estimation-seconds
- hibernate-mode hibernate-delay-seconds hibernate-state
- hybrid-sleep-state hybrid-sleep-mode
+ hibernate-mode hibernate-delay-seconds
allow-power-off-interrupts? allow-suspend-interrupts?
broadcast-power-off-interrupts? broadcast-suspend-interrupts?))
@@ -1642,24 +1635,6 @@ the user shall be removed when the user fully logs out.")
"The amount of time the system spends in suspend mode before the system is
automatically put into hibernate mode.")
- ;; TODO: Remove in May 2026.
- (hibernate-state
- maybe-list-of-strings
- "Deprecated option."
- (serializer elogind-deprecated-empty-serializer))
-
- ;; TODO: Remove in May 2026.
- (hybrid-sleep-state
- maybe-list-of-strings
- "Deprecated option."
- (serializer elogind-deprecated-empty-serializer))
-
- ;; TODO: Remove in May 2026.
- (hybrid-sleep-mode
- maybe-list-of-strings
- "Deprecated option."
- (serializer elogind-deprecated-empty-serializer))
-
(prefix elogind-))
(define (logind.conf config)
