* [bug#40229] [PATCH] gnu: clipmenu: Update to 6.0.1.
@ 2020-03-25 20:38 Damien Cassou
[not found] ` <handler.40229.B.158516874629175.ack@debbugs.gnu.org>
0 siblings, 1 reply; 5+ messages in thread
From: Damien Cassou @ 2020-03-25 20:38 UTC (permalink / raw)
To: 40229
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
* gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.
--
Damien Cassou
"Success is the ability to go from one failure to another without
losing enthusiasm." --Winston Churchill
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-clipmenu-Update-to-6.0.1.patch --]
[-- Type: text/x-patch, Size: 2013 bytes --]
From c42b50c699610c2a8aa311369f34695abb8c0578 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
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 | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)
[not found] ` <handler.40229.B.158516874629175.ack@debbugs.gnu.org>
@ 2020-03-25 20:57 ` Damien Cassou
2020-03-29 20:17 ` Marius Bakke
0 siblings, 1 reply; 5+ messages in thread
From: Damien Cassou @ 2020-03-25 20:57 UTC (permalink / raw)
To: 40229
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
Same patch but with indentation fixed, sorry.
--
Damien Cassou
"Success is the ability to go from one failure to another without
losing enthusiasm." --Winston Churchill
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-clipmenu-Update-to-6.0.1.patch --]
[-- Type: text/x-patch, Size: 7630 bytes --]
From 50f29606881099cd0823c96e8c69b6559be2636f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)
2020-03-25 20:57 ` [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.) Damien Cassou
@ 2020-03-29 20:17 ` Marius Bakke
2020-03-30 13:50 ` Damien Cassou
0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2020-03-29 20:17 UTC (permalink / raw)
To: Damien Cassou, 40229
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
Damien Cassou <damien@cassou.me> writes:
> Same patch but with indentation fixed, sorry.
Thanks! Can you submit the indentation change as a separate commit?
[...]
> * gnu/packages/xdisorg.scm (clipmenu): Update to 6.0.1.
[...]
> + (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 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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)
2020-03-29 20:17 ` Marius Bakke
@ 2020-03-30 13:50 ` Damien Cassou
2020-04-03 13:32 ` bug#40229: " Marius Bakke
0 siblings, 1 reply; 5+ messages in thread
From: Damien Cassou @ 2020-03-30 13:50 UTC (permalink / raw)
To: Marius Bakke, 40229
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Thanks! Can you submit the indentation change as a separate commit?
changing indentation was only necessary because of the switch to the
tarball. It's not necessary anymore.
> 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 without
losing enthusiasm." --Winston Churchill
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-clipnotify-Update-to-6.0.1.patch --]
[-- Type: text/x-patch, Size: 1294 bytes --]
From 67876912ccc40dcbe539e0a1e8523d021a1e4b5c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 30 Mar 2020 13:59:34 +0200
Subject: [PATCH] gnu: clipnotify: Update to 6.0.1.
* gnu/packages/xdisorg.scm (clipnotify): Update to 6.0.1.
---
gnu/packages/xdisorg.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#40229: Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.)
2020-03-30 13:50 ` Damien Cassou
@ 2020-04-03 13:32 ` Marius Bakke
0 siblings, 0 replies; 5+ messages in thread
From: Marius Bakke @ 2020-04-03 13:32 UTC (permalink / raw)
To: Damien Cassou, 40229-done
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
Damien Cassou <damien@cassou.me> writes:
>> 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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-03 13:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 20:38 [bug#40229] [PATCH] gnu: clipmenu: Update to 6.0.1 Damien Cassou
[not found] ` <handler.40229.B.158516874629175.ack@debbugs.gnu.org>
2020-03-25 20:57 ` [bug#40229] Acknowledgement ([PATCH] gnu: clipmenu: Update to 6.0.1.) Damien Cassou
2020-03-29 20:17 ` Marius Bakke
2020-03-30 13:50 ` Damien Cassou
2020-04-03 13:32 ` bug#40229: " Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.