GNU bug report logs - #76335
[PATCH 0/1] trash-cli: Update to 0.24.5.26.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76335 in the body.
You can then email your comments to 76335 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: simon <at> netpanic.org
To: guix-patches <at> gnu.org
Cc: Simon Streit <simon <at> netpanic.org>
Subject: [PATCH 0/1] trash-cli: Update to 0.24.5.26.
Date: Sun, 16 Feb 2025 13:57:56 +0100

From: Simon Streit <simon <at> netpanic.org>

Hello,


as promised to clear my local modifications, please find attached a
patch to update trash-cli to 0.24.5.26.

I added python-shtab as new native-input to enable the generation of
completion files.  I tried to get this working in the build process.
The results where not as good as expected.

I am leaving this as an open task for someone else to pick up.  Thus
the package is only upgraded to the newest current version for now.


Kind regards

Simon Streit (1):
  gnu: trash-cli: Update to 0.24.5.26.

 gnu/packages/shellutils.scm | 61 +++++++++++++++----------------------
 1 file changed, 25 insertions(+), 36 deletions(-)

--
2.47.1

Message #8 received at 76335 <at> debbugs.gnu.org (full text, mbox):

From: simon <at> netpanic.org
To: 76335 <at> debbugs.gnu.org
Cc: Simon Streit <simon <at> netpanic.org>
Subject: [PATCH 1/1] gnu: trash-cli: Update to 0.24.5.26.
Date: Sun, 16 Feb 2025 14:00:42 +0100

From: Simon Streit <simon <at> netpanic.org>

* gnu/packages/shellutils.scm (trash-cli): Update to 0.24.5.26.

* gnu/packages/shellutils.scm: Update to 0.24.5.26.  Improve
  style. [native-iinputs]: Add python-shtab. Sort.

Change-Id: I2f9ca7e2eb27657d8356c5cd3648c1e3a10cd0a8
---
 gnu/packages/shellutils.scm | 61 +++++++++++++++----------------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index dc9a51e25f..7bd245142a 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -645,7 +645,7 @@ (define-public envstore
 (define-public trash-cli
   (package
     (name "trash-cli")
-    (version "0.22.10.20")
+    (version "0.24.5.26")
     (source
      (origin
        (method git-fetch)
@@ -654,44 +654,33 @@ (define-public trash-cli
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n"))))
+        (base32 "1mqs3y9vbph33jsaa5hc0fhk80pklmsn8ylp979k9qj63fgqrnwn"))))
     (build-system python-build-system)
     (arguments
-     (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
-           python-flexmock
-           python-mock
-           python-six))
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (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-flexmock
+                         python-mock
+                         python-parameterized
+                         python-pytest
+                         python-shtab
+                         python-six))
     (inputs (list coreutils))
-    (propagated-inputs
-     (list python-psutil))
+    (propagated-inputs (list python-psutil))
     (home-page "https://github.com/andreafrancia/trash-cli")
     (synopsis "Trash can management tool")
     (description
-- 
2.47.1

Message #13 received at 76335-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: simon <at> netpanic.org
Cc: 76335-done <at> debbugs.gnu.org
Subject: Re: [bug#76335] [PATCH 1/1] gnu: trash-cli: Update to 0.24.5.26.
Date: Mon, 07 Apr 2025 21:14:37 +0100

[Message part 1 (text/plain, inline)]

simon <at> netpanic.org writes:

> From: Simon Streit <simon <at> netpanic.org>
>
> * gnu/packages/shellutils.scm (trash-cli): Update to 0.24.5.26.
>
> * gnu/packages/shellutils.scm: Update to 0.24.5.26.  Improve
>   style. [native-iinputs]: Add python-shtab. Sort.
>
> Change-Id: I2f9ca7e2eb27657d8356c5cd3648c1e3a10cd0a8
> ---
>  gnu/packages/shellutils.scm | 61 +++++++++++++++----------------------
>  1 file changed, 25 insertions(+), 36 deletions(-)

Thanks for the patch, I've pushed this to master as
3f69bfe87e3f0a0b3a6b5e1022faa6efd397b4e6.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.