From patchwork Wed Mar 25 20:57:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Cassou X-Patchwork-Id: 20889 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 E239A27BBEA; Wed, 25 Mar 2020 20:59:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5CC1E27BBE4 for ; Wed, 25 Mar 2020 20:59:15 +0000 (GMT) Received: from localhost ([::1]:43262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHD7K-0002eX-Ph for patchwork@mira.cbaines.net; Wed, 25 Mar 2020 16:59:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42809) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHD79-0002e3-Fo for guix-patches@gnu.org; Wed, 25 Mar 2020 16:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHD77-0007Nx-VY for guix-patches@gnu.org; Wed, 25 Mar 2020 16:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHD77-0007Nn-QN for guix-patches@gnu.org; Wed, 25 Mar 2020 16:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jHD77-00088Z-Om for guix-patches@gnu.org; Wed, 25 Mar 2020 16:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.) Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Mar 2020 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40229@debbugs.gnu.org Received: via spool by 40229-submit@debbugs.gnu.org id=B40229.158516988531200 (code B ref 40229); Wed, 25 Mar 2020 20:59:01 +0000 Received: (at 40229) by debbugs.gnu.org; 25 Mar 2020 20:58:05 +0000 Received: from localhost ([127.0.0.1]:57834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHD6C-000879-V0 for submit@debbugs.gnu.org; Wed, 25 Mar 2020 16:58:05 -0400 Received: from mail.choca.pics ([80.67.172.235]:48100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHD6A-00086s-PV for 40229@debbugs.gnu.org; Wed, 25 Mar 2020 16:58:03 -0400 Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 307EE18195760 for <40229@debbugs.gnu.org>; Wed, 25 Mar 2020 21:58:01 +0100 (CET) Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id cHP0TpYwuP4K for <40229@debbugs.gnu.org>; Wed, 25 Mar 2020 21:58:00 +0100 (CET) Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 2954D18191BB0 for <40229@debbugs.gnu.org>; Wed, 25 Mar 2020 21:58:00 +0100 (CET) X-Virus-Scanned: amavisd-new at choca.pics Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id aaXhZkSbaw12 for <40229@debbugs.gnu.org>; Wed, 25 Mar 2020 21:57:59 +0100 (CET) Received: from luz4 (57.139.120.78.rev.sfr.net [78.120.139.57]) by mail.choca.pics (Postfix) with ESMTPSA id D41DB18192B26 for <40229@debbugs.gnu.org>; Wed, 25 Mar 2020 21:57:59 +0100 (CET) From: Damien Cassou In-Reply-To: References: <875zesuq3r.fsf@cassou.me> Date: Wed, 25 Mar 2020 21:57:59 +0100 Message-ID: <87369wup7s.fsf@cassou.me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Same patch but with indentation fixed, sorry. From 50f29606881099cd0823c96e8c69b6559be2636f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 25 Mar 2020 21:37:15 +0100 Subject: [PATCH] gnu: clipmenu: Update to 6.0.1. * gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1. --- gnu/packages/xdisorg.scm | 138 ++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index facd63ab53..29d0833914 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2169,78 +2169,70 @@ (define-public clipnotify (license license:public-domain))) (define-public clipmenu - (let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c") - (revision "1")) - (package - (name "clipmenu") - (version (string-append "5.6.0-" - revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cdown/clipnotify.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) - (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 "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"))) - (for-each - (lambda (prog) - (wrap-script (string-append out "/bin/" prog) - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list clipnotify coreutils-minimal - gawk util-linux xdotool xsel))))) - '("clipmenu" "clipmenud" "clipdel"))) - #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 - `(("clipnotify" ,clipnotify) - ("coreutils-minimal" ,coreutils-minimal) - ("gawk" ,gawk) - ("guile" ,guile-3.0) ; for wrap-script - ("util-linux" ,util-linux) - ("xdotool" ,xdotool) - ("xsel" ,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.0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/cdown/clipmenu/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 (base32 "1wcvpz8wd369px8j8bgy21yqmb4h8zvya4k7qp8hvy27ac13z6h1")))) + (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 "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"))) + (for-each + (lambda (prog) + (wrap-script (string-append out "/bin/" prog) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list clipnotify coreutils-minimal + gawk util-linux xdotool xsel))))) + '("clipmenu" "clipmenud" "clipdel"))) + #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 + `(("clipnotify" ,clipnotify) + ("coreutils-minimal" ,coreutils-minimal) + ("gawk" ,gawk) + ("guile" ,guile-3.0) ; for wrap-script + ("util-linux" ,util-linux) + ("xdotool" ,xdotool) + ("xsel" ,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 @@ -2248,4 +2240,4 @@ (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))) -- 2.25.1