From patchwork Thu Jun 19 07:58:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43206 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A14527BC4B; Thu, 19 Jun 2025 09:01:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7A6B227BC49 for ; Thu, 19 Jun 2025 09:00:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACc-00005Q-Hk; Thu, 19 Jun 2025 04:00:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uSABx-0008Ks-RI for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:17 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSABx-0000Dp-Fh for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=WQ38m2GePbWqA6drY8xSJT8yCj/5kOBTCjRAhfh3/A0=; b=bh72mvL5mUISxVe57luy0ExxOCmTUC+cCdoCMWdSeSb9EZBxutYNgP62jAOpdNR1YGjVqgKlwEKmSgzmb63hF+CsVjAAoeeoA62CVFxIf/kpTvK4m6Xzidzp2tQSPTEbQ/v6CjQiVk3ajFgtCKyjtz0kqz7snu/i+RQn3lGMncVFLL4IQ4SDSr/E9Rm2nO6mzY5lgDw0Ray9nAVXctTm5I55zlQKxlBfBOhb5vVdDrhhdTHWJ2gbTYMxAwVMz9uQy0sujehF8derrLOAlsgf01/JXn6lzj52fNUFLtNlZ+TKvPRThFUjtQH6AUmWR8dwizgGA0VfiVrpflpG398auw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSABx-0006wS-57 for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 3/8] gnu: ulauncher: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997126280 (code B ref 78828); Thu, 19 Jun 2025 08:00:12 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:31 +0000 Received: from localhost ([127.0.0.1]:60332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABD-0006pL-S3 for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:30 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:42211) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAs-0006lU-4V for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:12 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfw2QSpz1jX8; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.94]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfw0qCQz1yXV; Thu, 19 Jun 2025 07:59:04 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B3D04D440A1; Thu, 19 Jun 2025 07:59:03 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G0028f1398b7-03cf-431f-9587-5c5fcde20e7a, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:49 +0200 Message-ID: <20250619075859.10878-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14071497036596044514 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteelfeettdejffeufffgffdujefguefhvdehkeefkeeghfevvdekfefhheekudelnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpuhhlrghunhgthhgvrhdrihhonecukfhppeduvdejrddtrddtrddupdektddrvdduhedrudeiledrvdduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvkeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=WQ38m2GePbWqA6drY8xSJT8yCj/5kOBTCjRAhfh3/A0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319944; v=1; b=rWJufVUb7oOd3ifYUz4xsCt19WNN1itLa3bnRDPWM+i5a/DQM36Lg5zVCuKQkl3p3ph17S0y EDw/FFpDhD/vsMjcq1N/zmQF9w+EUvR7taLuVPDvvJD5yWgM9rzxA4oS3SVe/5vfSjTi+ry+RRH KKi5baz5Rm2EifsYVC+IF517hK3+aNu6NyoP7J0lai8kmivdxmLG7dlSu1juf35RhwUYsDewNuB i9H0GqD03SM0Db72UKlzJZjciHFsLK3PfA3qQKu9iX4oDEZ/LQR3GxM1ts2E8vXvpkkhQXhz1oh utJ+0eRzIULAX4aSofj0rTWXFloQ+ptnpBG7r7Hd8NWRw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (ulauncher): Run guix style and properly pin the commit with a git-version. --- gnu/packages/xdisorg.scm | 115 ++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 90bdbcba61..9d66718630 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2091,64 +2091,67 @@ (define-public xdpyprobe (license license:gpl3+))) (define-public ulauncher - (package - (name "ulauncher") - (version "6.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Ulauncher/Ulauncher") - (commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-libX11 - (lambda* (#:key inputs #:allow-other-keys) - (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-os-release - (lambda _ - (define (touch file) - (call-with-output-file file - (const #t))) - (let* ((hard-path "/etc/os-release") - (fixed-path (string-append #$output - hard-path))) - ;; Make it relative - ;; Update hardcoded path to something - ;; within the build enviroment. - (substitute* "ulauncher/utils/environment.py" - ((hard-path) - fixed-path)) - ;; Create directory for the dummy file. - (mkdir-p (string-append #$output "/etc")) - (touch fixed-path)))) - (add-before 'check 'env-setup - ;; The test require access to home to put temporary files. - (lambda _ - (setenv "HOME" - (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) - (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) - (home-page "https://ulauncher.io") - (synopsis "Application launcher for Linux") - (description - "Ulauncher is a fast application launcher for Linux. It is written in + (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") + (revision "4")) + (package + (name "ulauncher") + (version (git-version "6.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ulauncher/Ulauncher") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-libX11 + (lambda* (#:key inputs #:allow-other-keys) + (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-os-release + (lambda _ + (define (touch file) + (call-with-output-file file + (const #t))) + (let* ((hard-path "/etc/os-release") + (fixed-path (string-append #$output hard-path))) + ;; Make it relative + ;; Update hardcoded path to something + ;; within the build enviroment. + (substitute* "ulauncher/utils/environment.py" + ((hard-path) + fixed-path)) + ;; Create directory for the dummy file. + (mkdir-p (string-append #$output "/etc")) + (touch fixed-path)))) + (add-before 'check 'env-setup + ;; The test require access to home to put temporary files. + (lambda _ + (setenv "HOME" + (getcwd))))))) + (native-inputs (list intltool python-distutils-extra python-mock)) + (inputs (list libx11 python-levenshtein python-pycairo)) + (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas + python-pygobject webkitgtk-with-libsoup2)) + (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