[PATCH] gnu: clipmenu: Update to 6.0.1.

Damien Cassou wrote on 25 Mar 2020 21:38

Recipients:(address . guix-patches@gnu.org)

Message-ID:875zesuq3r.fsf@cassou.me

* gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.
-- Damien Cassou
"Success is the ability to go from one failure to another withoutlosing enthusiasm." --Winston Churchill

From c42b50c699610c2a8aa311369f34695abb8c0578 Mon Sep 17 00:00:00 2001
* gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.--- gnu/packages/xdisorg.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)

Toggle diff (41 lines)diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scmindex facd63ab53..f09e4d52bc 100644--- a/gnu/packages/xdisorg.scm+++ b/gnu/packages/xdisorg.scm@@ -2169,22 +2169,14 @@ (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"))))+    (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@@ -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

Damien Cassou wrote on 25 Mar 2020 21:57

Re: bug#40229: Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)

Recipients:(address . 40229@debbugs.gnu.org)

Message-ID:87369wup7s.fsf@cassou.me

Same patch but with indentation fixed, sorry.
-- Damien Cassou
"Success is the ability to go from one failure to another withoutlosing enthusiasm." --Winston Churchill

From 50f29606881099cd0823c96e8c69b6559be2636f Mon Sep 17 00:00:00 2001
* gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.--- gnu/packages/xdisorg.scm | 138 ++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 73 deletions(-)

Toggle diff (155 lines)diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scmindex 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

Marius Bakke wrote on 29 Mar 2020 22:17

Re: [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)

Recipients:

Message-ID:874ku6x6eq.fsf@devup.no

Damien Cassou <damien@cassou.me> writes:

Toggle quote (2 lines)

> Same patch but with indentation fixed, sorry.

Thanks! Can you submit the indentation change as a separate commit?
[...]

Toggle quote (2 lines)

> * gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.

[...]

Toggle quote (7 lines)

> + (package> + (name "clipmenu")> + (version "6.0.1")> + (source (origin> + (method url-fetch)> + (uri (string-append "https://github.com/cdown/clipmenu/archive/" version ".tar.gz"))

The GitHub /archive/ URL's are not stable: the tarballs they generatemay get regenerated in the future with different timestamps and breakthe checksum. So please continue using git-fetch here.
Can you send an updated patch? TIA!

Damien Cassou wrote on 30 Mar 2020 15:50

Recipients:

Message-ID:87ftdqc5pn.fsf@cassou.me

Marius Bakke <mbakke@fastmail.com> writes:

Toggle quote (3 lines)

> Thanks! Can you submit the indentation change as a separate commit?

changing indentation was only necessary because of the switch to thetarball. It's not necessary anymore.

Toggle quote (6 lines)

> The GitHub /archive/ URL's are not stable: the tarballs they generate> may get regenerated in the future with different timestamps and break> the checksum. So please continue using git-fetch here.>> Can you send an updated patch? TIA!

here it is.
-- Damien Cassou
"Success is the ability to go from one failure to another withoutlosing enthusiasm." --Winston Churchill

From 67876912ccc40dcbe539e0a1e8523d021a1e4b5c Mon Sep 17 00:00:00 2001
* gnu/packages/xdisorg.scm (clipnotify): Update to 6.0.1.--- gnu/packages/xdisorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (27 lines)diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scmindex 22c8adc6fa..9335b48976 100644--- a/gnu/packages/xdisorg.scm+++ b/gnu/packages/xdisorg.scm@@ -2169,17 +2169,17 @@ (define-public clipnotify     (license license:public-domain)))  (define-public clipmenu-  (let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c")+  (let ((commit "bcbe7b144598db4a103f14e8408c4b7327d6d5e1")         (revision "1"))     (package       (name "clipmenu")-      (version (string-append "5.6.0-"+      (version (string-append "6.0.1-"                               revision "." (string-take commit 7)))       (source        (origin          (method git-fetch)          (uri (git-reference-               (url "https://github.com/cdown/clipnotify.git")+               (url "https://github.com/cdown/clipmenu.git")                (commit commit)))          (file-name (git-file-name name version))          (sha256-- 2.25.1

Marius Bakke wrote on 3 Apr 2020 15:32

Recipients:

Message-ID:87tv20pudu.fsf@devup.no

Damien Cassou <damien@cassou.me> writes:

Toggle quote (8 lines)

>> The GitHub /archive/ URL's are not stable: the tarballs they generate>> may get regenerated in the future with different timestamps and break>> the checksum. So please continue using git-fetch here.>>>> Can you send an updated patch? TIA!>> here it is.

Pushed in 1ace39da78dc076f60542ad7729a29f2f6760076, thanks!

Closed

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 40229@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date