guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 1a19afcd97913717601217567e2b06f7dd71e1aa
Author: Nguyễn Gia Phong <[email protected]>
AuthorDate: Wed Dec 17 13:47:48 2025 +0900
gnu: quickswitch-i3: Update to 2.8.0.
* gnu/packages/wm.scm (quickswitch-i3): Update to 2.8.0.
[home-page]: Update to new upstream.
[source]: Update URI. Remove patch.
[build-system]: Change to pyproject-build-system.
[native-inputs]: Add python-setuptools.
[arguments]: Update to modern style.
* gnu/packages/patches/quickswitch-fix-dmenu-check.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
Change-Id: I9d5f25498b464356590011d2ce49a43e515a8cfb
Signed-off-by: Cayetano Santos <[email protected]>
---
gnu/local.mk | 1 -
.../patches/quickswitch-fix-dmenu-check.patch | 32 ----------
gnu/packages/wm.scm | 68 +++++++++-------------
3 files changed, 29 insertions(+), 72 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 4afa93eed0..5db831f0af 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2219,7 +2219,6 @@ dist_patch_DATA =
\
%D%/packages/patches/qtbase-5-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
- %D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/quilt-grep-compat.patch \
%D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \
%D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \
diff --git a/gnu/packages/patches/quickswitch-fix-dmenu-check.patch
b/gnu/packages/patches/quickswitch-fix-dmenu-check.patch
deleted file mode 100644
index 9c6cca47c6..0000000000
--- a/gnu/packages/patches/quickswitch-fix-dmenu-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix check for dmenu (open file mode, dependency on which).
-
-See <https://github.com/proxypoke/quickswitch-for-i3/pull/24>.
-
---- quickswitch-i3-2.2/quickswitch.py 2016-09-18 19:59:10.257765542 +0200
-+++ quickswitch-i3-2.2/quickswitch.py 2016-09-21 10:43:01.277577819 +0200
-@@ -24,9 +24,10 @@
-
- import argparse
- import subprocess
--import os
- import re
-
-+from distutils.spawn import find_executable
-+
- try:
- import i3
- except ImportError:
-@@ -37,11 +38,8 @@
-
- def check_dmenu():
- '''Check if dmenu is available.'''
-- devnull = open(os.devnull)
-- retcode = subprocess.call(["which", "dmenu"],
-- stdout=devnull,
-- stderr=devnull)
-- return True if retcode == 0 else False
-+ executable = find_executable("dmenu")
-+ return executable != None
-
-
- def dmenu(options, dmenu):
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 63444322d3..3266d7f502 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1155,47 +1155,37 @@ tools in a live programming environment.")
(license license:lgpl3)))
(define-public quickswitch-i3
- (let ((commit "ed692b1e8f43b95bd907ced26238ce8ccb2ed28f")
- (revision "1")) ; Guix package revision
- (package
- (name "quickswitch-i3")
- (version (string-append "2.2-" revision "."
- (string-take commit 7)))
- (source
- (origin
- ;; The latest commit is a few years old and just a couple commits
- ;; after the last tagged release, so we use that latest commit
- ;; instead of the release.
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/proxypoke/quickswitch-for-i3";)
- (commit commit)))
- (sha256
- (base32
- "0447077sama80jcdg5p64zjsvafmz5rbdrirhm1adcdjhkh6iqc5"))
- (patches (search-patches "quickswitch-fix-dmenu-check.patch"))
- (file-name (string-append name "-" version "-checkout"))))
- (build-system python-build-system)
- (arguments
- `(#:tests? #f ; no tests yet
- #:phases (modify-phases %standard-phases
- (add-after 'install 'install-doc
- ;; Copy readme file to documentation directory.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((doc (string-append (assoc-ref outputs "out")
- "/share/doc/" ,name)))
- (install-file "README.rst" doc)
- ;; Avoid unspecified return value.
- #t))))))
- (inputs
- (list python-i3-py dmenu))
- (home-page "https://github.com/proxypoke/quickswitch-for-i3";)
- (synopsis "Quickly change to and locate windows in the i3 window
manager")
- (description
- "This utility for the i3 window manager allows you to quickly switch to
+ (package
+ (name "quickswitch-i3")
+ (version "2.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tyjak/quickswitch-for-i3";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0d28l66j4nb3636j2xqd6gi7q55fy9prn4d1hv6glgykb0x4kw65"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda _
+ (install-file "README.rst"
+ (string-append
+ #$output "/share/doc/"
+ #$name "-" #$version)))))
+ #:tests? #f)) ; no tests yet
+ (native-inputs (list python-setuptools))
+ (inputs (list python-i3-py dmenu))
+ (home-page "https://github.com/tyjak/quickswitch-for-i3";)
+ (synopsis "Quickly change to and locate windows in the i3 window manager")
+ (description
+ "This utility for the i3 window manager allows you to quickly switch to
and locate windows on all your workspaces, using an interactive dmenu
prompt.")
- (license license:wtfpl2))))
+ (license license:wtfpl2)))
(define-public quicktile
;; Latest release, 0.4.0, is 5 years old and does not use pyproject.toml yet.
