GNU bug report logs - #59296
[PATCH 0/2] Update trash-cli to 0.22.10.20.

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 59296 in the body.
You can then email your comments to 59296 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: kiasoc5 <kiasoc5 <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH 0/2] Update trash-cli to 0.22.10.20.
Date: Tue, 15 Nov 2022 21:46:39 -0500

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

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

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 59296 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH 1/2] gnu: trash-cli: Update to 0.22.10.20.
Date: Tue, 15 Nov 2022 21:49:02 -0500

* 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

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

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 59296 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH 2/2] gnu: trash-cli: Use G-expressions.
Date: Tue, 15 Nov 2022 21:49:04 -0500

* 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

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

From: Christopher Baines <mail <at> cbaines.net>
To: kiasoc5 <kiasoc5 <at> disroot.org>
Cc: 59296-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20.
Date: Thu, 17 Nov 2022 12:09:26 +0000

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

kiasoc5 via Guix-patches via <guix-patches <at> 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

[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.