From unknown Wed Jun 18 23:05:14 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59296 <59296@debbugs.gnu.org> To: bug#59296 <59296@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Update trash-cli to 0.22.10.20. Reply-To: bug#59296 <59296@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:05:14 +0000 retitle 59296 [PATCH 0/2] Update trash-cli to 0.22.10.20. reassign 59296 guix-patches submitter 59296 kiasoc5 severity 59296 normal tag 59296 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 15 21:47:06 2022 Received: (at submit) by debbugs.gnu.org; 16 Nov 2022 02:47:06 +0000 Received: from localhost ([127.0.0.1]:55697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8S9-0004W3-Ri for submit@debbugs.gnu.org; Tue, 15 Nov 2022 21:47:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:57632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8S7-0004Vs-LT for submit@debbugs.gnu.org; Tue, 15 Nov 2022 21:47:04 -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 ) id 1ov8S7-00010Z-H9 for guix-patches@gnu.org; Tue, 15 Nov 2022 21:47:03 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ov8S4-0006V3-Lz for guix-patches@gnu.org; Tue, 15 Nov 2022 21:47:03 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1E5274093D; Wed, 16 Nov 2022 03:46:58 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SZZt0Sqlmumw; Wed, 16 Nov 2022 03:46:57 +0100 (CET) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668566817; bh=ATVVn4LacJbLOpWkPy0VJX05c3jNje8YAKdCjfhmutM=; h=From:To:Cc:Subject:Date:From; b=VxXk+C6j5NuO38TUtt/8XUTdvcJtVkILWyGWF8FFcuz4jFxMER55V9abXbF6J51rB w7Uw1pfi/sO7hEuqPIL4z+MdBIX16MY73s1FxK6A71W4jUeAWSUEGvudeV7FeVQzAV T7gof2gMcQ9/r4EENCHiOVGYGp1D+Dlfjk084bYmrNfj9dIuBICX44txqlManmzFkW CCahr5x6ixuLwfR6Y4S518UIIzXbAsLIiVLShQpMyefD1yaGke1hhdK3PSapa+a5Lv 7ypF+cYmtlYI8zhz8NV3yGTaea1CnWnlnOam/VVLQmqlancD8xDsaPAwYHdU9kMHVR oK6dBKOyXlzuw== To: guix-patches@gnu.org Subject: [PATCH 0/2] Update trash-cli to 0.22.10.20. Date: Tue, 15 Nov 2022 21:46:39 -0500 Message-Id: <20221116024639.31739-1-kiasoc5@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: kiasoc5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 15 21:49:25 2022 Received: (at 59296) by debbugs.gnu.org; 16 Nov 2022 02:49:25 +0000 Received: from localhost ([127.0.0.1]:55703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8UP-0004cT-8i for submit@debbugs.gnu.org; Tue, 15 Nov 2022 21:49:25 -0500 Received: from knopi.disroot.org ([178.21.23.139]:58554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8UN-0004cL-Tz for 59296@debbugs.gnu.org; Tue, 15 Nov 2022 21:49:24 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2C5FC41181; Wed, 16 Nov 2022 03:49:23 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 44UgUyDItRSr; Wed, 16 Nov 2022 03:49:22 +0100 (CET) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668566962; bh=ew644PatRXFX9CeRw5OJcz6zEx9HXNLV8Ml4qO0RWGc=; h=From:To:Cc:Subject:Date:From; b=DCH4vi+Qjc2UYTR2rFRa15PGjTNToJ853wA4VSE9chpF2qb2eQffxUooJjhyz6nIy Sy7ZSI7IDOg1lCCxKYBWd5azuyhMiX7PwiBXd7Ad+GCCnVbnqLnO9olUQ2WhU6glv3 qw3Yvg57zhO3pXG2w3HJZBWNTpZIDXqXb4J0T/TcVnmFgbptZyncdusa37mjGY20k+ FhG++/fRrmP4VbmVc/s8NYKyUdzgFtp+Q86LtdiZZuvJKsafWDQ/lM/XFgvtL3NsWQ qo2ybYZc7pHzT235bDYQw6LUEaM3EZsJEPHzHjhZMzsOJltKgdio21lUXpmZTDkIEq LEXYZO21BXA+A== To: 59296@debbugs.gnu.org Subject: [PATCH 1/2] gnu: trash-cli: Update to 0.22.10.20. Date: Tue, 15 Nov 2022 21:49:02 -0500 Message-Id: <20221116024902.31966-1-kiasoc5@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59296 Cc: kiasoc5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 15 21:49:53 2022 Received: (at 59296) by debbugs.gnu.org; 16 Nov 2022 02:49:54 +0000 Received: from localhost ([127.0.0.1]:55706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8Ur-0004dH-JP for submit@debbugs.gnu.org; Tue, 15 Nov 2022 21:49:53 -0500 Received: from knopi.disroot.org ([178.21.23.139]:58852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ov8Uq-0004dA-Fr for 59296@debbugs.gnu.org; Tue, 15 Nov 2022 21:49:53 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DAE174093D; Wed, 16 Nov 2022 03:49:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DjFMt2e36LJb; Wed, 16 Nov 2022 03:49:50 +0100 (CET) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668566990; bh=xGlEM9T69LaMQtLTAxX3f1IIgTZ8QwFJo8eKLjuyUqg=; h=From:To:Cc:Subject:Date:From; b=elOvTW0O9nlMBnT0r8QxUhNPqkHTrla3BI3jBzfd4IX+GGxtEmrQUJBlxakDQGZpT nz4cUd5fNgnXpoKXP3Nq2RnxSYZmr8bCeg5rHzU2K+t/rwndaQR5PzBSJ15zuKwar5 UBbmMPxgurDaid/vudKN4t3FcC+ooKnUKyGErKycV+b0235WX0eqfjct5F7wpjuiTZ vZPBHr2xeTQnxYkPiW2wCC3tVPH6gloXUc1+I3IvCnqYhdGyr6Rfunsx0qsobgaQ7T Bargc64B//Rcr0uwztrqBCL8vnB7zsfDioFwa11vrEpv2whnbPvZ+5FgMXLyYB3MLE tlA7dcCwQxS5Q== To: 59296@debbugs.gnu.org Subject: [PATCH 2/2] gnu: trash-cli: Use G-expressions. Date: Tue, 15 Nov 2022 21:49:04 -0500 Message-Id: <20221116024902.31966-2-kiasoc5@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59296 Cc: kiasoc5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 17 07:10:01 2022 Received: (at submit) by debbugs.gnu.org; 17 Nov 2022 12:10:01 +0000 Received: from localhost ([127.0.0.1]:59434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovdiS-0002dt-Pj for submit@debbugs.gnu.org; Thu, 17 Nov 2022 07:10:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:47690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovdiR-0002dl-3H for submit@debbugs.gnu.org; Thu, 17 Nov 2022 07:09:59 -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 ) id 1ovdiQ-0000vD-Un for guix-patches@gnu.org; Thu, 17 Nov 2022 07:09:58 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovdiE-0007Nf-P5 for guix-patches@gnu.org; Thu, 17 Nov 2022 07:09:58 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 2278527BBEC; Thu, 17 Nov 2022 12:09:46 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 35b374aa; Thu, 17 Nov 2022 12:09:45 +0000 (UTC) References: <20221116024639.31739-1-kiasoc5@disroot.org> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: kiasoc5 Subject: Re: [bug#59296] [PATCH 0/2] Update trash-cli to 0.22.10.20. Date: Thu, 17 Nov 2022 12:09:26 +0000 In-reply-to: <20221116024639.31739-1-kiasoc5@disroot.org> Message-ID: <875yfdeq9i.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 59296-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain kiasoc5 via Guix-patches via 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmN2JIlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeAgQ//UsyieTsVWDsOqTlbf6qFbC69Fx7iRT2C w3k+7fmJPJGdi/n1hruNXAqqkrYL4TupS2adHvc4BBjic/SXZcYr6mYVPXXIZzKB 3K+oQlUIZQMeVStbimKOsL9o3EB2hblsnQlcSQNAVAFjFIHdYhDk7BGpLvShgokq 6WWGQ09cOi+jTE13Y+iIvXikZYLi8tk39Ray56KzDrG6K4tovmKpY71tI6SMJgLv zQqjQsSNilo9sLaQdHR0lrqwNrdGHOEm3tsDnBufzlDJVfJ+weVGgDAQx4fQjUQL 4CpBbB2p3J2XQObyUMoiEKK4vgoIbveYm6DoAS4EyjyxUNWLMuNW4MGA5qyTd14k +Lu9pa2djsDDN+6JjoVz4SU33XMZqYiuS/O03mtGTnwflCdh1bWtogYG6OlBmVLB IIvOrBBK2ilfw3nel1KJLWP4sVQVZmLZFiMyxAaNOxwwQnH2MXWxhm6SP1Yqbmsj lGFENpnHIyQxFXSQ4hAfaUDyNl88ZZJJQoJiPZIuWzvqS2lk40xITMAum5F69GDZ JMs6OjveFVHB9SVm7Zcdb0O20knLvbE9bFCzIgrqyO8xHU7LTYaX/uZrmy9N+3mq VSIaH1gp4U6X10hlA+X3+xzYAhUVU7ZQjTFAgYRILLn7D7F/Xxf5Hw+2XMiSQUgV 7pA86oxaN0Y= =8iY2 -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Jun 18 23:05:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 15 Dec 2022 12:24:17 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator