[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: trash-cli: Use G-expressions.
From: |
guix-commits |
Subject: |
04/08: gnu: trash-cli: Use G-expressions. |
Date: |
Thu, 17 Nov 2022 07:04:22 -0500 (EST) |
cbaines pushed a commit to branch master
in repository guix.
commit 024a98cb83c6b7d6bebbd56645bc6534d77f3ebc
Author: kiasoc5 <kiasoc5@disroot.org>
AuthorDate: Tue Nov 15 21:49:04 2022 -0500
gnu: trash-cli: Use G-expressions.
* gnu/packages/shellutils.scm (trash-cli)[arguments]: Use G-expressions.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/shellutils.scm | 51 ++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 40f33f5227..3fd98ecba8 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -382,32 +382,31 @@ between various shells or commands.")
"0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-path-constants
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((libc (assoc-ref inputs "libc"))
- (coreutils (assoc-ref inputs "coreutils")))
- (substitute* "trashcli/list_mount_points.py"
- (("\"/lib/libc.so.6\".*")
- (string-append "\"" libc "/lib/libc.so.6\"\n"))
- (("\"df\"")
- (string-append "\"" coreutils "/bin/df\""))))))
- (add-before 'build 'fix-setup.py
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (substitute* "setup.py"
- (("add_script\\('")
- (string-append "add_script('" bin "/" ))))))
- ;; Whenever setup.py is invoked, scripts in out/bin/ are
- ;; replaced. Thus we cannot invoke setup.py for testing.
- ;; Upstream also uses pytest.
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest")))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'patch-path-constants
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libc (search-input-file inputs "lib/libc.so.6"))
+ (df #$(file-append coreutils "/bin/df")))
+ (substitute* "trashcli/list_mount_points.py"
+ (("\"/lib/libc.so.6\".*")
+ (string-append "\"" libc "\"\n"))
+ (("\"df\"")
+ (string-append "\"" df "\""))))))
+ (add-before 'build 'fix-setup.py
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin")))
+ (mkdir-p bin)
+ (substitute* "setup.py"
+ (("add_script\\('")
+ (string-append "add_script('" bin "/" ))))))
+ ;; Whenever setup.py is invoked, scripts in out/bin/ are
+ ;; replaced. Thus we cannot invoke setup.py for testing.
+ ;; Upstream also uses pytest.
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest")))))))
(native-inputs
(list python-pytest
python-parameterized
- branch master updated (7ae4cfa5aa -> 7b7e80cf25), guix-commits, 2022/11/17
- 03/08: gnu: trash-cli: Update to 0.22.10.20., guix-commits, 2022/11/17
- 06/08: services: gitolite: Use the correct variable for the user-group., guix-commits, 2022/11/17
- 07/08: gnu: botan: Update to 2.19.2, guix-commits, 2022/11/17
- 01/08: gnu: Add navit., guix-commits, 2022/11/17
- 04/08: gnu: trash-cli: Use G-expressions.,
guix-commits <=
- 02/08: gnu: httpie: Update to 3.2.1., guix-commits, 2022/11/17
- 08/08: gnu: neovim: Update to 0.8.1., guix-commits, 2022/11/17
- 05/08: gnu: python-hypothesis: Update home-page., guix-commits, 2022/11/17