summaryrefslogtreecommitdiff
path: root/gnu/packages/freedesktop.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-10-20 13:31:44 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-11 12:18:20 -0500
commita0bf66ab9432675f86095d9a2533d7b80f58a668 (patch)
tree7b27ebb5c1b37363aecad015cb270a66149c8279 /gnu/packages/freedesktop.scm
parentdaf54a3953e807d46c4c21bbc709879c6e8d31e8 (diff)
gnu: elogind: Update to 246.10.
* gnu/packages/freedesktop.scm (elogind): Update to 246.10. Remove trailing #t. [configure-flags]: Address TODOs, removing conditionals and providing the kexec command. [phases]{adjust-tests}: Disable the test-user-util and test-event tests. [inputs]: Add kexec-tools.
Diffstat (limited to 'gnu/packages/freedesktop.scm')
-rw-r--r--gnu/packages/freedesktop.scm42
1 files changed, 21 insertions, 21 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d0083a84de..d0015c8622 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -580,7 +581,7 @@ the freedesktop.org XDG Base Directory specification.")
(define-public elogind
(package
(name "elogind")
- (version "243.7")
+ (version "246.10")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -589,26 +590,19 @@ the freedesktop.org XDG Base Directory specification.")
(file-name (git-file-name name version))
(sha256
(base32
- "1ccj3cbs9nsfg497wg195in1a7b9csm1jdm7z6q7vvx1ynpjxlxz"))))
+ "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
- ;; TODO(core-updates): Use #$output unconditionally.
- ,#~(let* ((out #$(if (%current-target-system)
- #~#$output
- #~(assoc-ref %outputs "out")))
+ ,#~(let* ((out #$output)
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
- ;; TODO(core-updates): use this-package-input unconditionally.
- (shadow #$(if (%current-target-system)
- (this-package-input "shadow")
- #~(assoc-ref %build-inputs "shadow")))
- (shepherd #$(if (%current-target-system)
- (this-package-input "shepherd")
- #~(assoc-ref %build-inputs "shepherd")))
+ (kexec-tools #$(this-package-input "kexec-tools"))
+ (shadow #$(this-package-input "shadow"))
+ (shepherd #$(this-package-input "shepherd"))
(halt-path (string-append shepherd "/sbin/halt"))
- (kexec-path "") ;not available in Guix yet
+ (kexec-path (string-append kexec-tools "/sbin/kexec"))
(nologin-path (string-append shadow "/sbin/nologin"))
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
@@ -634,10 +628,17 @@ the freedesktop.org XDG Base Directory specification.")
(lambda _
(substitute* "meson.build"
(("join_paths\\(bindir, 'pkttyagent'\\)")
- "'\"/run/current-system/profile/bin/pkttyagent\"'"))
- #t))
+ "'\"/run/current-system/profile/bin/pkttyagent\"'"))))
(add-after 'unpack 'adjust-tests
(lambda _
+ ;; Skip the following test, which depends on users such as 'root'
+ ;; existing in the build environment.
+ (invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g"
+ "-i" "src/test/meson.build")
+ ;; FIXME: This one times out for unknown reasons.
+ (invoke "sed"
+ "/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g"
+ "-i" "src/test/meson.build")
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
@@ -674,13 +675,11 @@ the freedesktop.org XDG Base Directory specification.")
;; Just skip it until a more narrow selection can be made.
(substitute* "src/libelogind/sd-login/test-login.c"
(("test_login\\(\\);")
- "return 77;"))
- #t))
+ "return 77;"))))
(add-after 'unpack 'change-pid-file-path
(lambda _
(substitute* "src/login/elogind.c"
- (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\""))
- #t)))))
+ (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\"")))))))
(native-inputs
`(("docbook-xml" ,docbook-xml)
("docbook-xml-4.2" ,docbook-xml-4.2)
@@ -693,7 +692,8 @@ the freedesktop.org XDG Base Directory specification.")
("python" ,python)
("xsltproc" ,libxslt)))
(inputs
- `(("linux-pam" ,linux-pam)
+ `(("kexec-tools" ,kexec-tools)
+ ("linux-pam" ,linux-pam)
("libcap" ,libcap)
("shadow" ,shadow) ;for 'nologin'
("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked