gnu: ulauncher: Improve style.

* gnu/packages/xdisorg.scm (ulauncher): Run guix style and properly
pin the commit with a git-version.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

gnu/packages/xdisorg.scm

@@ -2166,64 +2166,67 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
     (license license:gpl3+)))
 
 (define-public ulauncher
-  (package
+  (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9")
-    (name "ulauncher")
+        (revision "4"))
-    (version "6.0.0")
+    (package
-    (source (origin
+      (name "ulauncher")
-              (method git-fetch)
+      (version (git-version "6.0.0" revision commit))
-              (uri (git-reference
+      (source
-                    (url "https://github.com/Ulauncher/Ulauncher")
+       (origin
-                    (commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9")))
+         (method git-fetch)
-              (file-name (git-file-name name version))
+         (uri (git-reference
-              (sha256
+               (url "https://github.com/Ulauncher/Ulauncher")
-               (base32
+               (commit commit)))
-                "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1"))))
+         (file-name (git-file-name name version))
-    (build-system python-build-system)
+         (sha256
-    (arguments
+          (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1"))))
-     (list #:phases #~(modify-phases %standard-phases
+      (build-system python-build-system)
-                        (add-after 'unpack 'fix-libX11
+      (arguments
-                          (lambda* (#:key inputs #:allow-other-keys)
+       (list
-                            (substitute* "ulauncher/utils/xinit.py"
+        #:phases
-                              (("libX11.so.6")
+        #~(modify-phases %standard-phases
-                               (search-input-file inputs "/lib/libX11.so")))))
+            (add-after 'unpack 'fix-libX11
-                        (add-after 'unpack 'fix-usr
+              (lambda* (#:key inputs #:allow-other-keys)
-                          (lambda _
+                (substitute* "ulauncher/utils/xinit.py"
-                            (substitute* "setup.py"
+                  (("libX11.so.6")
-                              (("\\{sys.prefix\\}")
+                   (search-input-file inputs "/lib/libX11.so")))))
-                               (string-append #$output)))))
+            (add-after 'unpack 'fix-usr
-                        (add-after 'unpack 'fix-os-release
+              (lambda _
-                          (lambda _
+                (substitute* "setup.py"
-                            (define (touch file)
+                  (("\\{sys.prefix\\}")
-                              (call-with-output-file file
+                   (string-append #$output)))))
-                                (const #t)))
+            (add-after 'unpack 'fix-os-release
-                            (let* ((hard-path "/etc/os-release")
+              (lambda _
-                                   (fixed-path (string-append #$output
+                (define (touch file)
-                                                              hard-path)))
+                  (call-with-output-file file
-                              ;; Make it relative
+                    (const #t)))
-                              ;; Update hardcoded path to something
+                (let* ((hard-path "/etc/os-release")
-                              ;; within the build enviroment.
+                       (fixed-path (string-append #$output hard-path)))
-                              (substitute* "ulauncher/utils/environment.py"
+                  ;; Make it relative
-                                ((hard-path)
+                  ;; Update hardcoded path to something
-                                 fixed-path))
+                  ;; within the build enviroment.
-                              ;; Create directory for the dummy file.
+                  (substitute* "ulauncher/utils/environment.py"
-                              (mkdir-p (string-append #$output "/etc"))
+                    ((hard-path)
-                              (touch fixed-path))))
+                     fixed-path))
-                        (add-before 'check 'env-setup
+                  ;; Create directory for the dummy file.
-                          ;; The test require access to home to put temporary files.
+                  (mkdir-p (string-append #$output "/etc"))
-                          (lambda _
+                  (touch fixed-path))))
-                            (setenv "HOME"
+            (add-before 'check 'env-setup
-                                    (getcwd)))))))
+              ;; The test require access to home to put temporary files.
-    (native-inputs (list intltool python-distutils-extra python-mock))
+              (lambda _
-    (inputs (list libx11 python-levenshtein python-pycairo))
+                (setenv "HOME"
-    (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas
+                        (getcwd)))))))
-                             python-pygobject webkitgtk-with-libsoup2))
+      (native-inputs (list intltool python-distutils-extra python-mock))
-    (home-page "https://ulauncher.io")
+      (inputs (list libx11 python-levenshtein python-pycairo))
-    (synopsis "Application launcher for Linux")
+      (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas
-    (description
+                               python-pygobject webkitgtk-with-libsoup2))
-     "Ulauncher is a fast application launcher for Linux.  It is written in
+      (home-page "https://ulauncher.io")
+      (synopsis "Application launcher for Linux")
+      (description
+       "Ulauncher is a fast application launcher for Linux.  It is written in
 Python, using GTK+, and features: App Search (fuzzy matching), Calculator,
 Extensions, Shortcuts, File browser mode and Custom Color Themes.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public rofi
   (package