GNU bug report logs -
#58931
[PATCH 0/2] Update clipmenu and improve it
Previous Next
Reported by: EuAndreh <eu <at> euandre.org>
Date: Mon, 31 Oct 2022 20:10:02 UTC
Severity: normal
Tags: moreinfo, patch
Done: Christopher Baines <mail <at> cbaines.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 58931 in the body.
You can then email your comments to 58931 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Mon, 31 Oct 2022 20:10:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
EuAndreh <eu <at> euandre.org>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Mon, 31 Oct 2022 20:10:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Refactor build code, using g-expressions. A `git diff -w` (-w for
"whitespace") makes it clearer that those are the changes.
EuAndreh (2):
gnu: clipmenu: Update to 6.2.0.
gnu: clipmenu: Improve package style.
gnu/packages/xdisorg.scm | 146 +++++++++++++++++++--------------------
1 file changed, 71 insertions(+), 75 deletions(-)
--
2.38.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Mon, 31 Oct 2022 20:18:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 58931 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xdisorg.scm (clipmenu): Update to 6.2.0.
---
gnu/packages/xdisorg.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 1a868146a0..a0f0f54773 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2768,11 +2768,11 @@ (define-public clipnotify
(license license:public-domain)))
(define-public clipmenu
- (let ((commit "bcbe7b144598db4a103f14e8408c4b7327d6d5e1")
+ (let ((commit "7c34ace1fbab76eb1c1dc9b30dd4ac1a7fe4b90b")
(revision "1"))
(package
(name "clipmenu")
- (version (string-append "6.0.1-"
+ (version (string-append "6.2.0-"
revision "." (string-take commit 7)))
(source
(origin
@@ -2783,7 +2783,7 @@ (define-public clipmenu
(file-name (git-file-name name version))
(sha256
(base32
- "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9"))))
+ "1403sw49ccb8xsd8v611fzp0csaglfz8nmz3wcjsk8x11h9jvxwy"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -2799,6 +2799,8 @@ (define-public clipmenu
(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
@@ -2820,7 +2822,7 @@ (define-public clipmenu
(string-append dir "/bin"))
(list clipnotify coreutils-minimal
gawk util-linux xdotool xsel)))))
- '("clipmenu" "clipmenud" "clipdel")))
+ '("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl")))
#t))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
--
2.38.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Mon, 31 Oct 2022 20:18:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 58931 <at> debbugs.gnu.org (full text, mbox):
* 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
--
2.38.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Thu, 03 Nov 2022 17:17:03 GMT)
Full text and
rfc822 format available.
Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
EuAndreh via Guix-patches via <guix-patches <at> gnu.org> writes:
> * gnu/packages/xdisorg.scm (clipmenu)[arguments]: Use g-expressions;
> remove trailing #t from phases.
> [source]: Use url-fetch over ad-hoc git-fetch.
The linter points out:
the source URI should not be an autogenerated tarball
Given that, we probably want to stick with fetching via Git?
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Thu, 03 Nov 2022 17:17:03 GMT)
Full text and
rfc822 format available.
Added tag(s) moreinfo.
Request was from
Christopher Baines <mail <at> cbaines.net>
to
control <at> debbugs.gnu.org.
(Thu, 03 Nov 2022 18:01:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Tue, 29 Nov 2022 23:24:01 GMT)
Full text and
rfc822 format available.
Message #22 received at 58931 <at> debbugs.gnu.org (full text, mbox):
* 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
--
2.38.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Tue, 29 Nov 2022 23:24:02 GMT)
Full text and
rfc822 format available.
Message #25 received at 58931 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xdisorg.scm (clipmenu): Update to 6.2.0.
---
This patch is the same as previously.
gnu/packages/xdisorg.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 9cc7cc652a..f2edb793e8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2809,11 +2809,11 @@ (define-public clipnotify
(license license:public-domain)))
(define-public clipmenu
- (let ((commit "bcbe7b144598db4a103f14e8408c4b7327d6d5e1")
+ (let ((commit "7c34ace1fbab76eb1c1dc9b30dd4ac1a7fe4b90b")
(revision "1"))
(package
(name "clipmenu")
- (version (string-append "6.0.1-"
+ (version (string-append "6.2.0-"
revision "." (string-take commit 7)))
(source
(origin
@@ -2824,7 +2824,7 @@ (define-public clipmenu
(file-name (git-file-name name version))
(sha256
(base32
- "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9"))))
+ "1403sw49ccb8xsd8v611fzp0csaglfz8nmz3wcjsk8x11h9jvxwy"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -2840,6 +2840,8 @@ (define-public clipmenu
(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
@@ -2861,7 +2863,7 @@ (define-public clipmenu
(string-append dir "/bin"))
(list clipnotify coreutils-minimal
gawk util-linux xdotool xsel)))))
- '("clipmenu" "clipmenud" "clipdel")))
+ '("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl")))
#t))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
--
2.38.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Tue, 29 Nov 2022 23:25:01 GMT)
Full text and
rfc822 format available.
Message #28 received at 58931 <at> debbugs.gnu.org (full text, mbox):
Indeed the patch was triggering lint warnings.
These two do just the same thing, but now without changing from
git-fetch to url-fetch.
EuAndreh (2):
gnu: clipmenu: Update to 6.2.0.
gnu: clipmenu: Improve package style.
gnu/packages/xdisorg.scm | 95 ++++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 48 deletions(-)
--
2.38.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Tue, 14 Mar 2023 10:41:01 GMT)
Full text and
rfc822 format available.
Message #31 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
EuAndreh via Guix-patches via <guix-patches <at> gnu.org> writes:
> Indeed the patch was triggering lint warnings.
>
> These two do just the same thing, but now without changing from
> git-fetch to url-fetch.
>
> EuAndreh (2):
> gnu: clipmenu: Update to 6.2.0.
> gnu: clipmenu: Improve package style.
>
> gnu/packages/xdisorg.scm | 95 ++++++++++++++++++++--------------------
> 1 file changed, 47 insertions(+), 48 deletions(-)
Sorry for the delay in pushing these, I've finally pushed them to master
as 15bab8f1f70a64d2ba775e9083d39d91a6f22221.
Thanks,
Chris
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility.
(Tue, 14 Mar 2023 10:41:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
EuAndreh <eu <at> euandre.org>:
bug acknowledged by developer.
(Tue, 14 Mar 2023 10:41:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org:
bug#58931; Package
guix-patches.
(Tue, 14 Mar 2023 11:45:02 GMT)
Full text and
rfc822 format available.
Message #39 received at 58931 <at> debbugs.gnu.org (full text, mbox):
No worries, thanks for taking the time.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Wed, 12 Apr 2023 11:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 31 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.