From patchwork Mon Oct 31 20:17:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: EuAndreh X-Patchwork-Id: 44223 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 A4F8F27BBEA; Mon, 31 Oct 2022 20:19:07 +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 EBCC227BBE9 for ; Mon, 31 Oct 2022 20:19:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opbEm-0006h4-DV; Mon, 31 Oct 2022 16:18:24 -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 1opbER-0005uE-TA for guix-patches@gnu.org; Mon, 31 Oct 2022 16:18:15 -0400 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 1opbER-0001w1-0M for guix-patches@gnu.org; Mon, 31 Oct 2022 16:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opbEQ-0000tn-Ra for guix-patches@gnu.org; Mon, 31 Oct 2022 16:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58931] [PATCH 2/2] gnu: clipmenu: Improve package style. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Oct 2022 20:18:02 +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 To: 58931@debbugs.gnu.org Cc: EuAndreh Received: via spool by 58931-submit@debbugs.gnu.org id=B58931.16672474803438 (code B ref 58931); Mon, 31 Oct 2022 20:18:02 +0000 Received: (at 58931) by debbugs.gnu.org; 31 Oct 2022 20:18:00 +0000 Received: from localhost ([127.0.0.1]:41888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opbEN-0000tN-SK for submit@debbugs.gnu.org; Mon, 31 Oct 2022 16:18:00 -0400 Received: from box.euandre.org ([46.101.160.115]:60047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opbEM-0000sw-4b for 58931@debbugs.gnu.org; Mon, 31 Oct 2022 16:17:58 -0400 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id DA505FCD21; Mon, 31 Oct 2022 17:17:51 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1667247472; bh=ce1bvcfGXYszkxi0ydR45YYwf3TFkHK6SXfZ5y4WAeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZV8zkkUDHACCEclHxtG2z+IZS49nHhLv44hxNLGjoFB6F3GIc6/hfgQTnoXxQ9mEy ZopM4EgZEe+bOIaU2Ja6g/8Kv8UbyUdIFmrryQrW6CGr0dHu2TjnzE9xAdD5zLQUP8 5Om87UTtUkQfmxehOCbItBeqLgugt8VbftYHk3R8cyWFrZefSVoj2cexH0AaPJkjqc YFOjJkMO+L2Yk7q7tXTdw/RiwwNADprVhNwCUPKmn6Gy6HRZBtUDclrMs1UBLDZpJV mnW+kSmc9AWwlJmNCQ0uh8MbtwFV/tlauQGTpte0Z5Piddwpf6a2/qKIw5DDKnDSLi xcQe3coOrbhZw== Date: Mon, 31 Oct 2022 17:17:41 -0300 Message-Id: <20221031201741.29100-2-eu@euandre.org> In-Reply-To: <20221031201741.29100-1-eu@euandre.org> References: <20221031201741.29100-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: , Sender: "Guix-patches" 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+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. [source]: Use url-fetch over ad-hoc git-fetch. --- gnu/packages/xdisorg.scm | 148 +++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 77 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a0f0f54773..288a01129f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2768,82 +2768,76 @@ (define-public clipnotify (license license:public-domain))) (define-public clipmenu - (let ((commit "7c34ace1fbab76eb1c1dc9b30dd4ac1a7fe4b90b") - (revision "1")) - (package - (name "clipmenu") - (version (string-append "6.2.0-" - revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cdown/clipmenu") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "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))))) - (inputs - (list clipnotify - coreutils-minimal - gawk - guile-3.0 ; for wrap-script - util-linux - xdotool - xsel)) - (home-page "https://github.com/cdown/clipmenu") - (synopsis "Simple clipboard manager using dmenu or rofi and xsel") - (description "Start @command{clipmenud}, then run @command{clipmenu} to + (package + (name "clipmenu") + (version "6.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/cdown/clipmenu/archive/refs/tags/" + version + "/clipmenu-" version ".tar.gz")) + (sha256 + (base32 + "1f5vmncamnx5n3pwrs5s7v8c9xfckz6f3ikiiqbai3g7vclh90qm")))) + (build-system gnu-build-system) + (arguments + (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 + gawk + guile-3.0 ; for wrap-script + util-linux + xdotool + xsel)) + (home-page "https://github.com/cdown/clipmenu") + (synopsis "Simple clipboard manager using dmenu or rofi and xsel") + (description "Start @command{clipmenud}, then run @command{clipmenu} to select something to put on the clipboard. When @command{clipmenud} detects changes to the clipboard contents, it writes @@ -2851,7 +2845,7 @@ (define-public clipmenu to find all available clips and launches @command{dmenu} (or @command{rofi}, depending on the value of @code{CM_LAUNCHER}) to let the user select a clip. After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.") - (license license:public-domain)))) + (license license:public-domain))) (define-public kbdd (package