* [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20.
@ 2022-11-16 2:46 kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 1/2] gnu: trash-cli: Update " kiasoc5 via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-11-16 2:46 UTC (permalink / raw)
To: 59296; +Cc: kiasoc5
kiasoc5 (2):
gnu: trash-cli: Update to 0.22.10.20.
gnu: trash-cli: Use G-expressions.
gnu/packages/shellutils.scm | 57 +++++++++++++++++++------------------
1 file changed, 29 insertions(+), 28 deletions(-)
base-commit: 5512915c3bd62e061bd47d440da02e0826c1d0e7
--
2.38.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#59296] [PATCH 1/2] gnu: trash-cli: Update to 0.22.10.20.
2022-11-16 2:46 [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20 kiasoc5 via Guix-patches via
@ 2022-11-16 2:49 ` kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 2/2] gnu: trash-cli: Use G-expressions kiasoc5 via Guix-patches via
2022-11-17 12:09 ` bug#59296: [PATCH 0/2] Update trash-cli to 0.22.10.20 Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-11-16 2:49 UTC (permalink / raw)
To: 59296; +Cc: kiasoc5
* gnu/packages/shellutils.scm (trash-cli): Update to 0.22.10.20.
[native-inputs]: Add python-parameterized and python-flexmock.
---
gnu/packages/shellutils.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index e70b9ef706..40f33f5227 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -369,7 +369,7 @@ (define-public envstore
(define-public trash-cli
(package
(name "trash-cli")
- (version "0.21.10.24")
+ (version "0.22.10.20")
(source
(origin
(method git-fetch)
@@ -379,7 +379,7 @@ (define-public trash-cli
(file-name (git-file-name name version))
(sha256
(base32
- "01is32lk6prwhajvlmgn3xs4fcpmiqivizcqkj9k80jx6mqjifzs"))))
+ "0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -410,6 +410,8 @@ (define-public trash-cli
(invoke "pytest")))))))
(native-inputs
(list python-pytest
+ python-parameterized
+ python-flexmock
python-mock
python-six))
(inputs (list coreutils))
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#59296] [PATCH 2/2] gnu: trash-cli: Use G-expressions.
2022-11-16 2:46 [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20 kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 1/2] gnu: trash-cli: Update " kiasoc5 via Guix-patches via
@ 2022-11-16 2:49 ` kiasoc5 via Guix-patches via
2022-11-17 12:09 ` bug#59296: [PATCH 0/2] Update trash-cli to 0.22.10.20 Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-11-16 2:49 UTC (permalink / raw)
To: 59296; +Cc: kiasoc5
* gnu/packages/shellutils.scm (trash-cli)[arguments]: Use G-expressions.
---
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 @@ (define-public trash-cli
"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
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#59296: [PATCH 0/2] Update trash-cli to 0.22.10.20.
2022-11-16 2:46 [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20 kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 1/2] gnu: trash-cli: Update " kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 2/2] gnu: trash-cli: Use G-expressions kiasoc5 via Guix-patches via
@ 2022-11-17 12:09 ` Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2022-11-17 12:09 UTC (permalink / raw)
To: kiasoc5; +Cc: 59296-done, guix-patches
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
kiasoc5 via Guix-patches via <guix-patches@gnu.org> writes:
> kiasoc5 (2):
> gnu: trash-cli: Update to 0.22.10.20.
> gnu: trash-cli: Use G-expressions.
>
> gnu/packages/shellutils.scm | 57 +++++++++++++++++++------------------
> 1 file changed, 29 insertions(+), 28 deletions(-)
Thanks! Pushed to master as 024a98cb83c6b7d6bebbd56645bc6534d77f3ebc.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-17 12:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-16 2:46 [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20 kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 1/2] gnu: trash-cli: Update " kiasoc5 via Guix-patches via
2022-11-16 2:49 ` [bug#59296] [PATCH 2/2] gnu: trash-cli: Use G-expressions kiasoc5 via Guix-patches via
2022-11-17 12:09 ` bug#59296: [PATCH 0/2] Update trash-cli to 0.22.10.20 Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).