X-Loop: help-debbugs@HIDDEN Subject: [bug#76335] [PATCH 0/1] trash-cli: Update to 0.24.5.26. Resent-From: simon@HIDDEN Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 16 Feb 2025 12:59:02 +0000 Resent-Message-ID: <handler.76335.B.173971070228828 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 76335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76335 <at> debbugs.gnu.org Cc: Simon Streit <simon@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.173971070228828 (code B ref -1); Sun, 16 Feb 2025 12:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Feb 2025 12:58:22 +0000 Received: from localhost ([127.0.0.1]:60879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tjeE2-0007Uu-1R for submit <at> debbugs.gnu.org; Sun, 16 Feb 2025 07:58:22 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40220) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <simon@HIDDEN>) id 1tjeDz-0007UY-Jw for submit <at> debbugs.gnu.org; Sun, 16 Feb 2025 07:58:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <simon@HIDDEN>) id 1tjeDs-00076K-2m for guix-patches@HIDDEN; Sun, 16 Feb 2025 07:58:12 -0500 Received: from smtprelay06.ispgateway.de ([80.67.18.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <simon@HIDDEN>) id 1tjeDp-0008Ah-2J for guix-patches@HIDDEN; Sun, 16 Feb 2025 07:58:11 -0500 Received: from [195.52.128.27] (helo=milk.netpanic.home.arpa) by smtprelay06.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98) (envelope-from <simon@HIDDEN>) id 1tjeDe-000000004gc-169x; Sun, 16 Feb 2025 13:57:58 +0100 From: simon@HIDDEN Date: Sun, 16 Feb 2025 13:57:56 +0100 Message-ID: <cover.1739707953.git.simon@HIDDEN> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn Received-SPF: pass client-ip=80.67.18.29; envelope-from=simon@HIDDEN; helo=smtprelay06.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) From: Simon Streit <simon@HIDDEN> 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
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: simon@HIDDEN Subject: bug#76335: Acknowledgement ([PATCH 0/1] trash-cli: Update to 0.24.5.26.) Message-ID: <handler.76335.B.173971070228828.ack <at> debbugs.gnu.org> References: <cover.1739707953.git.simon@HIDDEN> X-Gnu-PR-Message: ack 76335 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76335 <at> debbugs.gnu.org Date: Sun, 16 Feb 2025 12:59:03 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76335 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76335: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76335 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#76335] [PATCH 1/1] gnu: trash-cli: Update to 0.24.5.26. Resent-From: simon@HIDDEN Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 16 Feb 2025 13:01:01 +0000 Resent-Message-ID: <handler.76335.B76335.173971085429584 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76335 <at> debbugs.gnu.org Cc: Simon Streit <simon@HIDDEN> Received: via spool by 76335-submit <at> debbugs.gnu.org id=B76335.173971085429584 (code B ref 76335); Sun, 16 Feb 2025 13:01:01 +0000 Received: (at 76335) by debbugs.gnu.org; 16 Feb 2025 13:00:54 +0000 Received: from localhost ([127.0.0.1]:60898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tjeGT-0007h6-Jc for submit <at> debbugs.gnu.org; Sun, 16 Feb 2025 08:00:53 -0500 Received: from smtprelay03.ispgateway.de ([80.67.31.41]:17567) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <simon@HIDDEN>) id 1tjeGQ-0007gt-6p for 76335 <at> debbugs.gnu.org; Sun, 16 Feb 2025 08:00:51 -0500 Received: from [195.52.128.27] (helo=milk.netpanic.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98) (envelope-from <simon@HIDDEN>) id 1tjeGY-0000000082r-2F4Q; Sun, 16 Feb 2025 14:00:58 +0100 From: simon@HIDDEN Date: Sun, 16 Feb 2025 14:00:42 +0100 Message-ID: <ed526a2b3c8161e93c1fb21df877639be136ae44.1739707953.git.simon@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <cover.1739707953.git.simon@HIDDEN> References: <cover.1739707953.git.simon@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) From: Simon Streit <simon@HIDDEN> * 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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.