From patchwork Tue Nov 29 23:23:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: EuAndreh X-Patchwork-Id: 44971 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 12B5F27BBEC; Tue, 29 Nov 2022 23:24:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 2A2FD27BBE9 for ; Tue, 29 Nov 2022 23:24:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p09xO-0007GX-6z; Tue, 29 Nov 2022 18:24:06 -0500 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 1p09xK-0007FW-Hy for guix-patches@gnu.org; Tue, 29 Nov 2022 18:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p09xK-0006cR-6T for guix-patches@gnu.org; Tue, 29 Nov 2022 18:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p09xJ-0004XX-Qe for guix-patches@gnu.org; Tue, 29 Nov 2022 18:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58931] [PATCH v2 2/2] gnu: clipmenu: Improve package style. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 23:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 58931@debbugs.gnu.org Cc: EuAndreh Received: via spool by 58931-submit@debbugs.gnu.org id=B58931.166976423617439 (code B ref 58931); Tue, 29 Nov 2022 23:24:01 +0000 Received: (at 58931) by debbugs.gnu.org; 29 Nov 2022 23:23:56 +0000 Received: from localhost ([127.0.0.1]:57115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p09xD-0004XC-JK for submit@debbugs.gnu.org; Tue, 29 Nov 2022 18:23:56 -0500 Received: from euandre.org ([216.238.68.100]:48066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p09xA-0004Wv-RZ for 58931@debbugs.gnu.org; Tue, 29 Nov 2022 18:23:54 -0500 Received: from euandre.org (localhost [127.0.0.1]) by euandre.org (Postfix) with ESMTP id 4181E37948D; Tue, 29 Nov 2022 20:23:51 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=euandre.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=dkimproxy; bh=jwVtwOx LsMgfIHJpJ4Cs7iyJlcs=; b=gKlESD8+U85Sdo/6Ddf0A7VVopVIcWdcB6GxCiT 5Zqh5IclgsQC/sdh46QK5sbPCV9VMVnQD6aeRtgdx9BkFfSS/UKeOyQQ0f+nxMPp ezF9ZFw3DFw7dC8hmU4Jg36yl6gXnwcwiU+b9MIS+jJgy7o8kYKwDfio1+vtEiMY TPbEP5qp+YWMLJWk/eBmYMvQMFzqE0JaX926pxJq8xMk+LJDKZWjg76qERvVOQJz r9Gl17D+Vve3EVE7apGzh3FS9p8vsXwR8ROgC+kZKbu++APCm+zlBJu+rMkqXMFN zAQ9BxvHrp0D7BGn2d3blLoyyry8yss0MGSx1bIDddswUVg== Date: Tue, 29 Nov 2022 20:23:46 -0300 Message-Id: <20221129232346.29710-3-eu@euandre.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129232346.29710-1-eu@euandre.org> References: <877d0cm00k.fsf@cbaines.net> <20221129232346.29710-1-eu@euandre.org> MIME-Version: 1.0 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: EuAndreh X-ACL-Warn: , EuAndreh via Guix-patches X-Patchwork-Original-From: EuAndreh via Guix-patches via From: EuAndreh 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 (clipmenu)[arguments]: Use g-expressions; remove trailing #t from phases. --- No more changing the git-fetch here. gnu/packages/xdisorg.scm | 91 +++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f2edb793e8..1943a75377 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2827,53 +2827,50 @@ (define-public clipmenu "1403sw49ccb8xsd8v611fzp0csaglfz8nmz3wcjsk8x11h9jvxwy")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append %output "/share/doc/" - ,name "-" ,version))) - (install-file "clipdel" bin) - (install-file "clipmenu" bin) - (install-file "clipmenud" bin) - (install-file "clipfsck" bin) - (install-file "clipctl" bin) - (install-file "README.md" doc) - #t))) - (add-after 'install 'wrap-script - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (clipnotify (assoc-ref inputs "clipnotify")) - (coreutils-minimal (assoc-ref inputs "coreutils-minimal")) - (gawk (assoc-ref inputs "gawk")) - (util-linux (assoc-ref inputs "util-linux")) - (xdotool (assoc-ref inputs "xdotool")) - (xsel (assoc-ref inputs "xsel")) - (guile (search-input-file inputs "bin/guile"))) - (for-each - (lambda (prog) - (wrap-script (string-append out "/bin/" prog) - #:guile guile - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list clipnotify coreutils-minimal - gawk util-linux xdotool xsel))))) - '("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl"))) - #t)) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; substitute a shebang appearing inside a string (the test - ;; file writes this string to a temporary file): - (substitute* "tests/test-clipmenu" - (("#!/usr/bin/env bash") - (string-append "#!" (which "bash")))) - (invoke "tests/test-clipmenu") - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin")) + (doc (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "clipdel" bin) + (install-file "clipmenu" bin) + (install-file "clipmenud" bin) + (install-file "clipfsck" bin) + (install-file "clipctl" bin) + (install-file "README.md" doc)))) + (add-after 'install 'wrap-script + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (clipnotify (assoc-ref inputs "clipnotify")) + (coreutils-minimal (assoc-ref inputs "coreutils-minimal")) + (gawk (assoc-ref inputs "gawk")) + (util-linux (assoc-ref inputs "util-linux")) + (xdotool (assoc-ref inputs "xdotool")) + (xsel (assoc-ref inputs "xsel")) + (guile (search-input-file inputs "bin/guile"))) + (for-each + (lambda (prog) + (wrap-script (string-append out "/bin/" prog) + #:guile guile + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list clipnotify coreutils-minimal + gawk util-linux xdotool xsel))))) + '("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl"))))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; substitute a shebang appearing inside a string (the test + ;; file writes this string to a temporary file): + (substitute* "tests/test-clipmenu" + (("#!/usr/bin/env bash") + (string-append "#!" (which "bash")))) + (invoke "tests/test-clipmenu")))))) (inputs (list clipnotify coreutils-minimal