[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/12: gnu: clipmenu: Improve package style.
From: |
guix-commits |
Subject: |
02/12: gnu: clipmenu: Improve package style. |
Date: |
Tue, 14 Mar 2023 06:37:32 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit 15bab8f1f70a64d2ba775e9083d39d91a6f22221
Author: EuAndreh via Guix-patches via <guix-patches@gnu.org>
AuthorDate: Tue Nov 29 20:23:46 2022 -0300
gnu: clipmenu: Improve package style.
* gnu/packages/xdisorg.scm (clipmenu)[arguments]: Use g-expressions; remove
trailing #t from phases.
---
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 a140f6c1c9..308fa131d6 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2891,53 +2891,50 @@ tools to complement clipnotify.")
"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
- branch master updated (302680dbce -> a6009e0bf8), guix-commits, 2023/03/14
- 01/12: gnu: clipmenu: Update to 6.2.0., guix-commits, 2023/03/14
- 04/12: gnu: rng-tools: Rewrite using gexps., guix-commits, 2023/03/14
- 03/12: gnu: splash: Update to 3.7.2., guix-commits, 2023/03/14
- 02/12: gnu: clipmenu: Improve package style.,
guix-commits <=
- 05/12: gnu: rng-tools: Do not build randstat binary., guix-commits, 2023/03/14
- 06/12: gnu: rng-tools: Update to 6.16., guix-commits, 2023/03/14
- 07/12: gnu: phantomsocks: Update to 0.0.0-20230223180716-34d21f24a9eb., guix-commits, 2023/03/14
- 09/12: gnu: tesseract-ocr: Update to 5.3.0., guix-commits, 2023/03/14
- 08/12: gnu: gimagereader: Update to 3.4.1., guix-commits, 2023/03/14
- 10/12: gnu: autokey: Update to 0.96.0., guix-commits, 2023/03/14
- 12/12: gnu: guix-build-coordinator: Update to 0-73.7c1eedf., guix-commits, 2023/03/14
- 11/12: gnu: mruby: Update to 3.2.0., guix-commits, 2023/03/14