From patchwork Sun Feb 16 13:00:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 38738 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3AB5427BBEA; Sun, 16 Feb 2025 13:01:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5BC7D27BBE2 for ; Sun, 16 Feb 2025 13:01:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjeGi-0007Yu-J2; Sun, 16 Feb 2025 08:01:09 -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 1tjeGe-0007Wd-0o for guix-patches@gnu.org; Sun, 16 Feb 2025 08:01:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjeGc-0000AD-68 for guix-patches@gnu.org; Sun, 16 Feb 2025 08:01:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=tcWEj5wkJIQgP1D+skFp4ThfXnfcWrA+wz6D/rhNWhM=; b=iqnyDB5UqtZD94Ur4TQ5IFRi5Ee5gFzt+vmeAP7tse43YqU0DRKGXrPsgDGI6BDeSeuyyDF1roTtB58XE1DYwS9Lubckel5HUAuzXl0hAsjf9chcsH288qMj6Ned2vH0JR+qiKeo3Ba8JYDfYt5wWY1BEfrux0JZAgot6Yp2ItUXsws1y842tVXm8ljhgkmqNqvxcD59XpCiAj8dpd7Vaf/IeyUlIhq916a/S5jLueOtTSdqwF5F5zPQDp/Z7VCuP/iZ4tP0XBuXkrUQSglyP+q7hXqLjX8kDRzUukTBdtuFg4H1z8n9fzAPAyfzbN3kkJKSkzcfcvRgs1NNL+kOLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjeGb-0007ha-Vo for guix-patches@gnu.org; Sun, 16 Feb 2025 08:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76335] [PATCH 1/1] gnu: trash-cli: Update to 0.24.5.26. Resent-From: simon@netpanic.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 13:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76335@debbugs.gnu.org Cc: Simon Streit Received: via spool by 76335-submit@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 ) id 1tjeGT-0007h6-Jc for submit@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 ) id 1tjeGQ-0007gt-6p for 76335@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 ) id 1tjeGY-0000000082r-2F4Q; Sun, 16 Feb 2025 14:00:58 +0100 From: simon@netpanic.org Date: Sun, 16 Feb 2025 14:00:42 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Simon Streit * 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