From 8d4a692acbfebaf0c219f9583e6695c78c17c482 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 22 Jun 2022 14:17:30 +0200 Subject: gnu: wlroots: Replace input libinput by libinput-minimal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (wlroots)[propagated-inputs]: Replace libinput by libinput-minimal to reduce closure. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0ea7641db3..fe1013023c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1538,7 +1538,7 @@ (define-public wlroots (propagated-inputs (list ;; As required by wlroots.pc. eudev - libinput + libinput-minimal libxkbcommon mesa pixman -- cgit v1.2.3 From fb14741131972754be32e51efd0ef5194a3aa198 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 22 Jun 2022 14:17:31 +0200 Subject: gnu: sway: Replace input libinput by libinput-minimal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (sway)[propagated-inputs]: Replace libinput by libinput-minimal to reduce closure. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fe1013023c..d07760f4f0 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1595,7 +1595,7 @@ (define-public sway gdk-pixbuf json-c libevdev - libinput + libinput-minimal libxkbcommon pango swaybg -- cgit v1.2.3 From 714bab022c0cdb7d285dffbf959a167ab0b0a2fd Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 22 Jun 2022 14:17:32 +0200 Subject: gnu: waybar: Replace input libinput by libinput-minimal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (waybar)[propagated-inputs]: Replace libinput by libinput-minimal to reduce closure. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d07760f4f0..2c79e1d03e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1727,7 +1727,7 @@ (define-public waybar gtkmm-3 jsoncpp libdbusmenu - libinput + libinput-minimal libmpdclient libnl libxml2 -- cgit v1.2.3 From 25c7f57548716ccb7246c595cdcee3a5ca9389df Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 22 Jun 2022 14:17:33 +0200 Subject: gnu: hikari: Replace input libinput by libinput-minimal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (hikari)[propagated-inputs]: Replace libinput by libinput-minimal to reduce closure. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2c79e1d03e..35b79919b1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2564,7 +2564,7 @@ (define-public hikari (list bmake pkg-config wayland-protocols)) (inputs `(("cairo" ,cairo) - ("libinput" ,libinput) + ("libinput" ,libinput-minimal) ("libucl" ,libucl) ("libxkbcommon" ,libxkbcommon) ("pam" ,linux-pam) -- cgit v1.2.3 From a5d8630e158718325c7804e8043b92013626158c Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 21 Jun 2022 14:14:08 -0400 Subject: gnu: polybar: Update to 3.6.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (polybar): Update to 3.6.3. [phases]: Add patch-config-path for polybar to find its default configuration file in the store. [inputs]: Add libuv, required to build polybar. [native-inputs]: Remove python-2, no longer needed. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 35b79919b1..ab97266f72 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1469,19 +1469,29 @@ (define-public nitrogen (define-public polybar (package (name "polybar") - (version "3.5.7") + (version "3.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar.gz")) (sha256 - (base32 "1nr386jdlm8qkbdf23w7lyvbfhr362s90f957fawnyi1finhw8bk")))) + (base32 "19azx5dpfyfh0pv4q2fcrf4p7a0pc5d13m7lnv3qy8376mbmhmzj")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the ;; Internet. - '(#:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Make polybar find its default configuration file in the + ;; store. + (add-after 'unpack 'patch-config-path + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") (string-append #$output "/etc"))) + (substitute* "src/utils/file.cpp" + (("\"/etc\"") (string-append "\"" #$output "/etc\"")))))))) (inputs (list alsa-lib cairo @@ -1489,6 +1499,7 @@ (define-public polybar jsoncpp libmpdclient libnl + libuv libxcb pulseaudio xcb-proto @@ -1500,9 +1511,6 @@ (define-public polybar (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ; for the manual - ;; XXX: "python" input must be located after "python-2", or the package - ;; fails to build with "missing required python module: xcbgen". - ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") (synopsis "Fast and easy-to-use status bar") -- cgit v1.2.3 From 30e27d8101b6775748ac52d03ed7c40460aef25b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 23 Jun 2022 10:35:56 -0400 Subject: gnu: polybar: Simply inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (polybar)[native-inputs]: Remove labels. Signed-off-by: Ludovic Courtès --- 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 ab97266f72..6933b1730a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1509,9 +1509,9 @@ (define-public polybar xcb-util-wm xcb-util-xrm)) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-sphinx" ,python-sphinx) ; for the manual - ("python" ,python))) ; xcb-proto depends on python 3 + (list pkg-config + python-sphinx ; for the manual + python)) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") (synopsis "Fast and easy-to-use status bar") (description "Polybar aims to help users build beautiful and highly -- cgit v1.2.3 From ed210c1b8ff95003645499a4b48279a68c4685cf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jun 2022 21:30:59 -0400 Subject: gnu: python-setuptools-scm: Move to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-setuptools-scm): Move from here... * gnu/packages/python-build.scm (python-setuptools-scm): ... to here. --- gnu/packages/astronomy.scm | 1 + gnu/packages/backup.scm | 1 + gnu/packages/benchmark.scm | 1 + gnu/packages/calendar.scm | 1 + gnu/packages/databases.scm | 1 + gnu/packages/dav.scm | 1 + gnu/packages/license.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/pep.scm | 1 + gnu/packages/python-build.scm | 22 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 21 --------------------- gnu/packages/task-management.scm | 1 + gnu/packages/time.scm | 1 + gnu/packages/wm.scm | 1 + 14 files changed, 34 insertions(+), 21 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 61c10c985f..82a67ce5ef 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -52,6 +52,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5646d909e5..f4a251dd47 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -86,6 +86,7 @@ (define-module (gnu packages backup) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index b718a65f7c..f0e05483f0 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -55,6 +55,7 @@ (define-module (gnu packages benchmark) #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 129eb58aa0..fa55822762 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -50,6 +50,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 72200fce92..9e9b584f7a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -131,6 +131,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 59015baa40..995a7b50d5 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -30,6 +30,7 @@ (define-module (gnu packages dav) #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index df8efe8423..3146f38c1c 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -25,6 +25,7 @@ (define-module (gnu packages license) #:use-module (gnu packages check) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (guix build-system perl) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3606efa4fe..a03bf2fa05 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -138,6 +138,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index d245ac74a3..f443170aa5 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -33,6 +33,7 @@ (define-module (gnu packages pep) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sequoia) #:use-module (gnu packages sqlite) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index d85463ebab..afccfabb2c 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2020 Marius Bakke @@ -403,3 +404,24 @@ (define-public python-flit-core (propagated-inputs (modify-inputs (package-propagated-inputs python-flit-core-bootstrap) (replace "python-toml" python-tomli))))) + +(define-public python-setuptools-scm + (package + (name "python-setuptools-scm") + (version "6.3.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "setuptools_scm" version)) + (sha256 + (base32 "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-packaging",python-packaging-bootstrap) + ("python-tomli" ,python-tomli))) + (home-page "https://github.com/pypa/setuptools_scm/") + (synopsis "Manage Python package versions in SCM metadata") + (description + "Setuptools_scm handles managing your Python package versions in +@dfn{software configuration management} (SCM) metadata instead of declaring +them as the version argument or in a SCM managed file.") + (license license:expat))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0bc951442f..b9d57bc6bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7813,27 +7813,6 @@ (define-public python-pexpect child application and control it as if a human were typing commands.") (license license:isc))) -(define-public python-setuptools-scm - (package - (name "python-setuptools-scm") - (version "6.3.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools_scm" version)) - (sha256 - (base32 "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4")))) - (build-system python-build-system) - (propagated-inputs - `(("python-packaging",python-packaging-bootstrap) - ("python-tomli" ,python-tomli))) - (home-page "https://github.com/pypa/setuptools_scm/") - (synopsis "Manage Python package versions in SCM metadata") - (description - "Setuptools_scm handles managing your Python package versions in -@dfn{software configuration management} (SCM) metadata instead of declaring -them as the version argument or in a SCM managed file.") - (license license:expat))) - (define-public python-sexpdata (package (name "python-sexpdata") diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index aeedbfbe6a..f8f52a8ccd 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -37,6 +37,7 @@ (define-module (gnu packages task-management) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) #:use-module (gnu packages tls) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index eede7b9bd7..fea9ff25f7 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -43,6 +43,7 @@ (define-module (gnu packages time) #:use-module (gnu packages golang) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6933b1730a..f0032cd4c7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -130,6 +130,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) -- cgit v1.2.3 From 1967c0422693764687bbe99720a56008408fd4f1 Mon Sep 17 00:00:00 2001 From: Elais Player Date: Sun, 26 Jun 2022 14:48:57 -0600 Subject: gnu: stumpwm: Update to 22.05. * gnu/packages/wm.scm (stumpwm): Update to 22.05. [arguments]: Add 'fix-tests' phase. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/wm.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f0032cd4c7..ba39ccd0e9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020, 2022 Guillaume Le Vaillant ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Robert Smith @@ -55,6 +55,7 @@ ;;; Copyright © 2022 Pier-Hugues Pellerin ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 muradm +;;; Copyright © 2022 Elais Player ;;; ;;; This file is part of GNU Guix. ;;; @@ -1820,7 +1821,7 @@ (define-public kanshi (define-public stumpwm (package (name "stumpwm") - (version "20.11") + (version "22.05") (source (origin (method git-fetch) @@ -1829,7 +1830,7 @@ (define-public stumpwm (commit version))) (file-name (git-file-name "stumpwm" version)) (sha256 - (base32 "1ghs6ihvmb3bz4q4ys1d3h6rdi96xyiw7l2ip7jh54c25049aymf")))) + (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiasco" ,sbcl-fiasco) ("texinfo" ,texinfo) @@ -1842,9 +1843,13 @@ (define-public stumpwm ("alexandria" ,sbcl-alexandria))) (outputs '("out" "lib")) (arguments - '(#:asd-systems '("stumpwm") - #:phases + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "stumpwm-tests.asd" + (("\"ALL-TESTS\"") + "\"RUN-PACKAGE-TESTS\" :package")))) (add-after 'create-asdf-configuration 'build-program (lambda* (#:key outputs #:allow-other-keys) (build-program -- cgit v1.2.3 From 144a750f8b10e606751bc887bcb09e7fb7ae09ff Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 27 Jun 2022 11:15:44 +0200 Subject: gnu: stumpwm: Improve package definition. * gnu/packages/wm.scm (stumpwm)[inputs, native-inputs]: Remove labels. [arguments]: Use gexp and remote trailing #t in phases. --- gnu/packages/wm.scm | 99 +++++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 49 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ba39ccd0e9..8fef7de77b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1832,57 +1832,58 @@ (define-public stumpwm (sha256 (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan")))) (build-system asdf-build-system/sbcl) - (native-inputs `(("fiasco" ,sbcl-fiasco) - ("texinfo" ,texinfo) - - ;; To build the manual. - ("autoconf" ,autoconf) - ("automake" ,automake))) - (inputs `(("cl-ppcre" ,sbcl-cl-ppcre) - ("clx" ,sbcl-clx) - ("alexandria" ,sbcl-alexandria))) + (native-inputs + (list sbcl-fiasco + texinfo + + ;; To build the manual. + autoconf + automake)) + (inputs + (list sbcl-alexandria + sbcl-cl-ppcre + sbcl-clx)) (outputs '("out" "lib")) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "stumpwm-tests.asd" - (("\"ALL-TESTS\"") - "\"RUN-PACKAGE-TESTS\" :package")))) - (add-after 'create-asdf-configuration 'build-program - (lambda* (#:key outputs #:allow-other-keys) - (build-program - (string-append (assoc-ref outputs "out") "/bin/stumpwm") - outputs - #:entry-program '((stumpwm:stumpwm) 0)))) - (add-after 'build-program 'create-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xsessions (string-append out "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/stumpwm.desktop") - (lambda (file) - (format file - "[Desktop Entry]~@ - Name=stumpwm~@ - Comment=The Stump Window Manager~@ - Exec=~a/bin/stumpwm~@ - TryExec=~@*~a/bin/stumpwm~@ - Icon=~@ - Type=Application~%" - out))) - #t))) - (add-after 'install 'install-manual - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (invoke "./autogen.sh") - (invoke "sh" "./configure" "SHELL=sh") - (apply invoke "make" "stumpwm.info" make-flags) - (install-file "stumpwm.info" info) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "stumpwm-tests.asd" + (("\"ALL-TESTS\"") + "\"RUN-PACKAGE-TESTS\" :package")))) + (add-after 'create-asdf-configuration 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/stumpwm") + outputs + #:entry-program '((stumpwm:stumpwm) 0)))) + (add-after 'build-program 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/stumpwm.desktop") + (lambda (file) + (format file + "[Desktop Entry]~@ + Name=stumpwm~@ + Comment=The Stump Window Manager~@ + Exec=~a/bin/stumpwm~@ + TryExec=~@*~a/bin/stumpwm~@ + Icon=~@ + Type=Application~%" + out)))))) + (add-after 'install 'install-manual + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (invoke "./autogen.sh") + (invoke "sh" "./configure" "SHELL=sh") + (apply invoke "make" "stumpwm.info" make-flags) + (install-file "stumpwm.info" info))))))) (synopsis "Window manager written in Common Lisp") (description "Stumpwm is a window manager written entirely in Common Lisp. It attempts to be highly customizable while relying entirely on the keyboard -- cgit v1.2.3