diff mbox series

[bug#78828,4/8] gnu: ulauncher: Update to 6.0.0-18.901ce03.

Message ID 20250619075859.10878-4-ngraves@ngraves.fr
State New
Headers
Series None |

Commit Message

Nicolas Graves June 19, 2025, 7:58 a.m. UTC 
  * gnu/packages/xdisorg.scm (ulauncher): Update to 6.0.0-18.901ce03.
  [build-system]: Switch to pyproject-build-system.
  [arguments]{test-flags}: Ignore some failing tests.
  {phases}: Remove deprecated phase 'fix-usr. Add phase 'fix-bash.
  [native-inputs]: Remove python-distutils-extra. Add python-pytest,
  python-pytest-mock, python-setuptools, python-wheel.
  [propagated-inputs]: Add python-xlib.
---
 gnu/packages/xdisorg.scm | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 9d66718630..f65d24b3d1 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2091,8 +2091,8 @@  (define-public xdpyprobe
     (license license:gpl3+)))
 
 (define-public ulauncher
-  (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9")
-        (revision "4"))
+  (let ((commit "901ce03beb157ff8fb354558594495eb74c6de7b")
+        (revision "18"))
     (package
       (name "ulauncher")
       (version (git-version "6.0.0" revision commit))
@@ -2104,10 +2104,14 @@  (define-public ulauncher
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1"))))
-      (build-system python-build-system)
+          (base32 "0qrqpbqrrklfgqr48zafzggrbzns2q6h27nh63skfd9w582nsajg"))))
+      (build-system pyproject-build-system)
       (arguments
        (list
+        #:test-flags
+        ;; XXX: Most likely require a running X server.
+        #~(list "--ignore=tests/ui/test_preferences_server.py"
+                "--ignore=tests/ui/test_result_widget.py")
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'fix-libX11
@@ -2115,11 +2119,11 @@  (define-public ulauncher
                 (substitute* "ulauncher/utils/xinit.py"
                   (("libX11.so.6")
                    (search-input-file inputs "/lib/libX11.so")))))
-            (add-after 'unpack 'fix-usr
-              (lambda _
-                (substitute* "setup.py"
-                  (("\\{sys.prefix\\}")
-                   (string-append #$output)))))
+            (add-after 'unpack 'fix-bash
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* "tests/modes/shortcuts/test_run_script.py"
+                  (("/bin/bash")
+                   (search-input-file inputs "bin/bash")))))
             (add-after 'unpack 'fix-os-release
               (lambda _
                 (define (touch file)
@@ -2141,10 +2145,19 @@  (define (touch file)
               (lambda _
                 (setenv "HOME"
                         (getcwd)))))))
-      (native-inputs (list intltool python-distutils-extra python-mock))
+      (native-inputs (list intltool
+                           python-mock
+                           python-pytest
+                           python-pytest-mock
+                           python-setuptools
+                           python-wheel))
       (inputs (list libx11 python-levenshtein python-pycairo))
-      (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas
-                               python-pygobject webkitgtk-with-libsoup2))
+      (propagated-inputs (list keybinder
+                               libwnck
+                               gsettings-desktop-schemas
+                               python-pygobject
+                               python-xlib
+                               webkitgtk-with-libsoup2))
       (home-page "https://ulauncher.io")
       (synopsis "Application launcher for Linux")
       (description