gnu: autokey: Move to xdisorg.

* gnu/packages/python-xyz.scm (xdisorg): Move from here ...
* gnu/packages/xdisorg.scm: ... to here.

Change-Id: Ifcc3230cce5549fc62d3d23e755654dc4431aba2

2 files changed, 87 insertions, 84 deletions

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 06d86343878..c16c9a878eb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8628,89 +8628,6 @@ alternative representations which do not require this package.")
 structure for Python.")
     (license license:asl2.0)))
 
-(define-public autokey
-  (package
-    (name "autokey")
-    (version "0.96.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/autokey/autokey")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1v19196swihc12bcg0d9s07gfc3a44b9y7g6rqhb82qxm4p8jmbp"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 328 passed, 2 skipped, 1 deselected, 13 xfailed, 1 warning
-      #:test-flags
-      ;;  AssertionError: Ensure the most recent git tag version matches the
-      ;;  version number in lib/autokey/common.py
-      #~(list "--deselect=tests/test_common.py::test_version_number_accurate")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-pytest-config
-            (lambda _
-              (substitute* "setup.cfg"
-                (("--cov-repor.*") ""))))
-          ;; Use 'prefix' instead of '=' to allow the user to use additional
-          ;; GI paths from their autokey scripts.  GUIX_PYTHONPATH is already
-          ;; wrapped with prefix in python-build-system's wrap.
-          (add-after 'wrap 'wrap-executable
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
-                    ;; see lib/autokey/UI_common_functions.py
-                    (path (list (string-append #$(this-package-input "wmctrl")
-                                               "/bin")
-                                (string-append #$(this-package-input "zenity")
-                                               "/bin"))))
-                (for-each
-                 (lambda (program)
-                   (wrap-program program
-                     `("PATH" ":" prefix ,path)
-                     `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-                 (map (lambda (name)
-                        (string-append #$output "/bin/" name))
-                      '("autokey-gtk"
-                        "autokey-qt"
-                        "autokey-run"
-                        "autokey-shell"))))))
-          (add-before 'check 'setup-env-vars
-            (lambda _
-              ;; tests/test_macro.py wants LANG set
-              (setenv "LANG" "")
-              ;; required for tests/test_configmanager.py
-              (setenv "HOME" "/tmp"))))))
-    (native-inputs
-     (list python-pyhamcrest
-           git-minimal
-           python-pytest
-           python-setuptools))
-    (inputs
-     (list bash-minimal ; for wrap-program
-           gtksourceview-3
-           libappindicator
-           libnotify
-           python-dbus
-           python-ipython
-           python-pygobject
-           python-pyinotify
-           python-pyqt+qscintilla
-           python-xlib
-           wmctrl
-           zenity))
-    (home-page "https://github.com/autokey/autokey")
-    (synopsis "Keyboard and GUI automation utility")
-    (description
-     "AutoKey is a desktop automation utility for X11.  It allows the
-automation of virtually any task by responding to typed abbreviations and
-hotkeys.  It offers a full-featured GUI (GTK and QT versions) that makes it
-highly accessible for novices, as well as a scripting interface offering the
-full flexibility and power of the Python language.")
-    (license license:gpl3+)))
-
 (define-public kalamine
   (package
     (name "kalamine")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index ad01b322f56..8fe96963992 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -59,10 +59,11 @@
 ;;; Copyright © 2022 Derek Chuank <derekchuank@outlook.com>
 ;;; Copyright © 2022, 2023 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
+;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
-;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
@@ -72,6 +73,7 @@
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 iamawacko <iamawacko@protonmail.com>
 ;;; Copyright © 2025 dan <i@dan.games>
+;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -167,6 +169,7 @@
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg)
@@ -177,6 +180,89 @@
 
 ;; packages outside the x.org system proper
 
+(define-public autokey
+  (package
+    (name "autokey")
+    (version "0.96.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/autokey/autokey")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1v19196swihc12bcg0d9s07gfc3a44b9y7g6rqhb82qxm4p8jmbp"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; tests: 328 passed, 2 skipped, 1 deselected, 13 xfailed, 1 warning
+      #:test-flags
+      ;;  AssertionError: Ensure the most recent git tag version matches the
+      ;;  version number in lib/autokey/common.py
+      #~(list "--deselect=tests/test_common.py::test_version_number_accurate")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-pytest-config
+            (lambda _
+              (substitute* "setup.cfg"
+                (("--cov-repor.*") ""))))
+          ;; Use 'prefix' instead of '=' to allow the user to use additional
+          ;; GI paths from their autokey scripts.  GUIX_PYTHONPATH is already
+          ;; wrapped with prefix in python-build-system's wrap.
+          (add-after 'wrap 'wrap-executable
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+                    ;; see lib/autokey/UI_common_functions.py
+                    (path (list (string-append #$(this-package-input "wmctrl")
+                                               "/bin")
+                                (string-append #$(this-package-input "zenity")
+                                               "/bin"))))
+                (for-each
+                 (lambda (program)
+                   (wrap-program program
+                     `("PATH" ":" prefix ,path)
+                     `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+                 (map (lambda (name)
+                        (string-append #$output "/bin/" name))
+                      '("autokey-gtk"
+                        "autokey-qt"
+                        "autokey-run"
+                        "autokey-shell"))))))
+          (add-before 'check 'setup-env-vars
+            (lambda _
+              ;; tests/test_macro.py wants LANG set
+              (setenv "LANG" "")
+              ;; required for tests/test_configmanager.py
+              (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list python-pyhamcrest
+           git-minimal
+           python-pytest
+           python-setuptools))
+    (inputs
+     (list bash-minimal ; for wrap-program
+           gtksourceview-3
+           libappindicator
+           libnotify
+           python-dbus
+           python-ipython
+           python-pygobject
+           python-pyinotify
+           python-pyqt+qscintilla
+           python-xlib
+           wmctrl
+           zenity))
+    (home-page "https://github.com/autokey/autokey")
+    (synopsis "Keyboard and GUI automation utility")
+    (description
+     "AutoKey is a desktop automation utility for X11.  It allows the
+automation of virtually any task by responding to typed abbreviations and
+hotkeys.  It offers a full-featured GUI (GTK and QT versions) that makes it
+highly accessible for novices, as well as a scripting interface offering the
+full flexibility and power of the Python language.")
+    (license license:gpl3+)))
+
 (define-public xnee
   (package
     (name "xnee")