futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: trash-cli: Use G-expressions.

Browse Source 
* gnu/packages/shellutils.scm (trash-cli)[arguments]: Use G-expressions.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
kiasoc5 2022-11-15 21:49:04 -05:00 committed by Christopher Baines
parent cfeb51a6de
commit 024a98cb83
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/packages/shellutils.scm
View File

@ -382,32 +382,31 @@ between various shells or commands.")
"0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n")))) "0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'patch-path-constants (add-before 'build 'patch-path-constants
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc")) (let ((libc (search-input-file inputs "lib/libc.so.6"))
(coreutils (assoc-ref inputs "coreutils"))) (df #$(file-append coreutils "/bin/df")))
(substitute* "trashcli/list_mount_points.py" (substitute* "trashcli/list_mount_points.py"
(("\"/lib/libc.so.6\".*") (("\"/lib/libc.so.6\".*")
(string-append "\"" libc "/lib/libc.so.6\"\n")) (string-append "\"" libc "\"\n"))
(("\"df\"") (("\"df\"")
(string-append "\"" coreutils "/bin/df\"")))))) (string-append "\"" df "\""))))))
(add-before 'build 'fix-setup.py (add-before 'build 'fix-setup.py
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((bin (string-append #$output "/bin")))
(bin (string-append out "/bin"))) (mkdir-p bin)
(mkdir-p bin) (substitute* "setup.py"
(substitute* "setup.py" (("add_script\\('")
(("add_script\\('") (string-append "add_script('" bin "/" ))))))
(string-append "add_script('" bin "/" )))))) ;; Whenever setup.py is invoked, scripts in out/bin/ are
;; Whenever setup.py is invoked, scripts in out/bin/ are ;; replaced. Thus we cannot invoke setup.py for testing.
;; replaced. Thus we cannot invoke setup.py for testing. ;; Upstream also uses pytest.
;; Upstream also uses pytest. (replace 'check
(replace 'check (lambda* (#:key tests? #:allow-other-keys)
(lambda* (#:key tests? #:allow-other-keys) (when tests?
(when tests? (invoke "pytest")))))))
(invoke "pytest")))))))
(native-inputs (native-inputs
(list python-pytest (list python-pytest
python-parameterized python-parameterized