diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-06-26 11:58:47 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-06-26 12:09:48 +0100 |
| commit | 22683101f36f0832574ec32c84cc77dfa08872fd (patch) | |
| tree | e043846896f8b24fd8e05d3f077b5884ec850a05 /gnu/packages/shellutils.scm | |
| parent | 03eec7034fa856b77ec5d6c23bb6240efcb23922 (diff) | |
gnu: trash-cli: Use pyproject-build-system.
* gnu/packages/shellutils.scm (trash-cli) [build-system]: Use
pyproject.
[arguments] <phases>: Use default 'check.
[native-inputs]: Add python-setuptools and python-wheel.
Change-Id: Icd3042bd1989c1b8eb428677b9f11dc5f9cd3f07
Diffstat (limited to 'gnu/packages/shellutils.scm')
| -rw-r--r-- | gnu/packages/shellutils.scm | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 769eea0b299..e688e243e2b 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #:use-module (guix build-system gnu) | 49 | #:use-module (guix build-system gnu) |
| 50 | #:use-module (guix build-system go) | 50 | #:use-module (guix build-system go) |
| 51 | #:use-module (guix build-system python) | 51 | #:use-module (guix build-system python) |
| 52 | #:use-module (guix build-system pyproject) | ||
| 52 | #:use-module (gnu packages admin) | 53 | #:use-module (gnu packages admin) |
| 53 | #:use-module (gnu packages autotools) | 54 | #:use-module (gnu packages autotools) |
| 54 | #:use-module (gnu packages base) | 55 | #:use-module (gnu packages base) |
| @@ -71,6 +72,7 @@ | |||
| 71 | #:use-module (gnu packages pcre) | 72 | #:use-module (gnu packages pcre) |
| 72 | #:use-module (gnu packages pkg-config) | 73 | #:use-module (gnu packages pkg-config) |
| 73 | #:use-module (gnu packages python) | 74 | #:use-module (gnu packages python) |
| 75 | #:use-module (gnu packages python-build) | ||
| 74 | #:use-module (gnu packages python-xyz) | 76 | #:use-module (gnu packages python-xyz) |
| 75 | #:use-module (gnu packages readline) | 77 | #:use-module (gnu packages readline) |
| 76 | #:use-module (gnu packages ruby) | 78 | #:use-module (gnu packages ruby) |
| @@ -657,10 +659,10 @@ between various shells or commands.") | |||
| 657 | (file-name (git-file-name name version)) | 659 | (file-name (git-file-name name version)) |
| 658 | (sha256 | 660 | (sha256 |
| 659 | (base32 "1mqs3y9vbph33jsaa5hc0fhk80pklmsn8ylp979k9qj63fgqrnwn")))) | 661 | (base32 "1mqs3y9vbph33jsaa5hc0fhk80pklmsn8ylp979k9qj63fgqrnwn")))) |
| 660 | (build-system python-build-system) | 662 | (build-system pyproject-build-system) |
| 661 | (arguments | 663 | (arguments |
| 662 | (list | 664 | (list |
| 663 | #:modules `((guix build python-build-system) | 665 | #:modules `((guix build pyproject-build-system) |
| 664 | (guix build utils) | 666 | (guix build utils) |
| 665 | (ice-9 match)) | 667 | (ice-9 match)) |
| 666 | #:phases #~(modify-phases %standard-phases | 668 | #:phases #~(modify-phases %standard-phases |
| @@ -671,13 +673,6 @@ between various shells or commands.") | |||
| 671 | (substitute* "setup.py" | 673 | (substitute* "setup.py" |
| 672 | (("add_script\\('") | 674 | (("add_script\\('") |
| 673 | (string-append "add_script('" bin "/")))))) | 675 | (string-append "add_script('" bin "/")))))) |
| 674 | ;; Whenever setup.py is invoked, scripts in out/bin/ are | ||
| 675 | ;; replaced. Thus we cannot invoke setup.py for testing. | ||
| 676 | ;; Upstream also uses pytest. | ||
| 677 | (replace 'check | ||
| 678 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 679 | (when tests? | ||
| 680 | (invoke "pytest")))) | ||
| 681 | (add-before 'wrap 'install-completions | 676 | (add-before 'wrap 'install-completions |
| 682 | (lambda _ | 677 | (lambda _ |
| 683 | (for-each | 678 | (for-each |
| @@ -711,8 +706,10 @@ between various shells or commands.") | |||
| 711 | python-mock | 706 | python-mock |
| 712 | python-parameterized | 707 | python-parameterized |
| 713 | python-pytest | 708 | python-pytest |
| 709 | python-setuptools | ||
| 714 | python-shtab | 710 | python-shtab |
| 715 | python-six)) | 711 | python-six |
| 712 | python-wheel)) | ||
| 716 | (inputs (list coreutils)) | 713 | (inputs (list coreutils)) |
| 717 | (propagated-inputs (list python-psutil)) | 714 | (propagated-inputs (list python-psutil)) |
| 718 | (home-page "https://github.com/andreafrancia/trash-cli") | 715 | (home-page "https://github.com/andreafrancia/trash-cli") |
