From d776899e18a49a967f0cce6912754c8bb3968ea2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jun 2022 13:04:59 +0200 Subject: gnu: idesk: Depend on imlib2@1.7. * gnu/packages/wm.scm (idesk)[inputs]: Depend on IMLIB2-1.7 instead of IMLIB2. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 123e6ca7e7..acef5c5836 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès +;;; Copyright © 2016 2019, 2021-2022 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2020 Nikita ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer @@ -2441,7 +2441,7 @@ selected to stdout. It can be controlled both via mouse and via keyboard.") libxpm libpng freetype - imlib2 + imlib2-1.7 sed)) (native-inputs (list pkg-config)) -- cgit v1.2.3 From 677ae314f6d8599980564ec69dfd3ff0111ef0b6 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Sun, 12 Jun 2022 13:33:07 +0300 Subject: gnu: herbstluftwm: Update to 0.9.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (herbstluftwm): Update to 0.9.4. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index acef5c5836..f053eeefcb 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -181,14 +181,14 @@ the leaves of a full binary tree.") (define-public herbstluftwm (package (name "herbstluftwm") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-" version ".tar.gz")) (sha256 - (base32 "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb")) + (base32 "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f")) (file-name (string-append "herbstluftwm-" version ".tar.gz")))) (build-system cmake-build-system) (inputs @@ -200,6 +200,7 @@ the leaves of a full binary tree.") xsetroot libx11 libxext + libxfixes libxinerama libxrandr libxft)) -- cgit v1.2.3 From 167b8f29b3679a23bb20f5ed4181738c389d9d89 Mon Sep 17 00:00:00 2001 From: muradm Date: Wed, 15 Jun 2022 12:17:40 +0300 Subject: gnu: admin: Add libseat 0.8.0 and move seatd. * gnu/packages/admin.scm (libseat): New variable * gnu/packages/admin.scm (seatd): New variable * gnu/packages/freedesktop.scm (seatd): Remove variable * gnu/packages/wm.scm (wlroots): Replace seatd input with libseat Signed-off-by: Lars-Dominik Braun --- gnu/packages/admin.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/freedesktop.scm | 29 ------------------------ gnu/packages/wm.scm | 4 +++- 3 files changed, 56 insertions(+), 30 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d432ec3091..c20ed4dac1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 muradm +;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Artyom V. Poptsov ;;; Copyright © 2022 Wamm K. D. @@ -104,6 +105,7 @@ #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -5168,3 +5170,54 @@ name space for storing data in PAM. greetd-pam-mount is used in configuration of greetd to provide auto-(mounting/unmounting) of XDG_RUNTIME_DIR in the way that it will not interfere with default pam-mount configuration."))) + +(define-public libseat + (package + (name "libseat") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~kennylevinsen/seatd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10f8387yy5as547xjjhl0cna6iywdgjmw0iq2nvcs8q6vlpnik4v")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Dlibseat-logind=elogind" + "-Dserver=disabled"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("elogind" ,elogind))) + (home-page "https://sr.ht/~kennylevinsen/seatd") + (synopsis "Seat management library") + (description + "This package provides a universal seat management library that +allows applications to use whatever seat management is available.") + (license license:expat))) + +(define-public seatd + (package + (inherit libseat) + (name "seatd") + (arguments + `(#:configure-flags '("-Dlibseat-logind=elogind") + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-libs + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (assoc-ref outputs "out") + (for-each delete-file-recursively '("lib" "include")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs '()) + (synopsis "Seat management daemon") + (description + "This package provides a minimal seat management daemon whose task is to +mediate access to shared devices, such as graphics and input, for applications +that require it.") + (license license:expat))) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8834e7b839..c54ce1cf31 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -849,35 +849,6 @@ GNOME Shell. The @command{localectl} command-line tool allows you to interact with localed. This package is extracted from the broader systemd package.") (license license:lgpl2.1+))) -(define-public seatd - (package - (name "seatd") - (version "0.5.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~kennylevinsen/seatd") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1kglq8v4rnr3415mfaghyv2s2f8mxsy5s881gmm2908ig4n4j297")))) - (build-system meson-build-system) - (arguments - `(#:configure-flags '("-Dlogind=enabled"))) - (native-inputs - (list pkg-config scdoc)) - (propagated-inputs - (list elogind)) - (home-page "https://sr.ht/~kennylevinsen/seatd") - (synopsis "Seat management daemon and library") - (description - "This package provides a minimal seat management daemon whose task is to -mediate access to shared devices, such as graphics and input, for applications -that require it. It also provides a universal seat management library that -allows applications to use whatever seat management is available.") - (license license:expat))) - (define-public packagekit (package (name "packagekit") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f053eeefcb..4194ec0fd9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 Pier-Hugues Pellerin ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -1538,7 +1540,7 @@ functionality to display information about the most commonly used services.") libxkbcommon mesa pixman - seatd + libseat wayland wayland-protocols xcb-util-errors -- cgit v1.2.3 From 1a2a209e6235620a305107e3ab90b14d23ca3f29 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Jun 2022 02:01:05 +0200 Subject: gnu: i3status: Make asciidoc a native input. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (i3status)[inputs]: Move asciidoc from here… [native-inputs]: …to here. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4194ec0fd9..bfbbc04b7c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -282,10 +282,10 @@ or musca). alsa-lib pulseaudio libnl - libcap - asciidoc)) + libcap)) (native-inputs - (list pkg-config docbook-xsl libxml2 ;for XML_CATALOG_FILES + (list asciidoc + pkg-config docbook-xsl libxml2 ;for XML_CATALOG_FILES xmlto)) (home-page "https://i3wm.org/i3status/") (synopsis "Status bar for i3bar, dzen2, xmobar or similar programs") -- cgit v1.2.3 From b5dc5f469c7538e831dfeb826f6a4bfbbe8ea116 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Jun 2022 02:00:01 +0200 Subject: gnu: i3status: Update to 2.14. * gnu/packages/wm.scm (i3status): Update to 2.14. [source]: Add snippet to delete pregenerated man page. [build-system]: Switch to Meson. [arguments]: Remove autotools-specific #:out-of-source? Build man pages. [inputs]: Remove unused openlibm and libcap. [native-inputs]: Add perl. --- gnu/packages/wm.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index bfbbc04b7c..d816bad871 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -261,31 +261,33 @@ or musca). (define-public i3status (package (name "i3status") - (version "2.13") + (version "2.14") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/i3status/i3status-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff")))) - (build-system gnu-build-system) + "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw")) + (snippet + ;; Delete the pregenerated man page, to be rebuilt from source. + '(delete-file "man/i3status.1")))) + (build-system meson-build-system) (arguments - `(;; XXX: Do an "out of source" build to work around - ;; . - #:out-of-source? #t - #:tests? #f)) ; no test suite + (list #:configure-flags + '(list "-Dmans=True") + #:tests? #f)) ; no test suite (inputs - (list openlibm + (list alsa-lib libconfuse - libyajl - alsa-lib - pulseaudio libnl - libcap)) + libyajl + pulseaudio)) (native-inputs (list asciidoc - pkg-config docbook-xsl libxml2 ;for XML_CATALOG_FILES + perl + pkg-config + docbook-xsl libxml2 ; for XML_CATALOG_FILES xmlto)) (home-page "https://i3wm.org/i3status/") (synopsis "Status bar for i3bar, dzen2, xmobar or similar programs") -- cgit v1.2.3