From patchwork Sun Sep 12 08:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32778 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 468B127BBE3; Sun, 12 Sep 2021 09:46:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C0DFD27BBE1 for ; Sun, 12 Sep 2021 09:46:24 +0100 (BST) Received: from localhost ([::1]:56498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPL82-0008W6-6V for patchwork@mira.cbaines.net; Sun, 12 Sep 2021 04:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPL7i-0008TI-Iw for guix-patches@gnu.org; Sun, 12 Sep 2021 04:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPL7i-0006zW-BK for guix-patches@gnu.org; Sun, 12 Sep 2021 04:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPL7i-0005qw-9M for guix-patches@gnu.org; Sun, 12 Sep 2021 04:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50542] [PATCH] gnu: patchutils: Update to 0.4.2. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Sep 2021 08:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50542@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163143634622473 (code B ref -1); Sun, 12 Sep 2021 08:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Sep 2021 08:45:46 +0000 Received: from localhost ([127.0.0.1]:42008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPL7M-0005qJ-NY for submit@debbugs.gnu.org; Sun, 12 Sep 2021 04:45:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:59204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPL7K-0005q8-4l for submit@debbugs.gnu.org; Sun, 12 Sep 2021 04:45:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPL7J-0007xG-Ly for guix-patches@gnu.org; Sun, 12 Sep 2021 04:45:37 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:58138 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPL7H-0006Zc-61 for guix-patches@gnu.org; Sun, 12 Sep 2021 04:45:37 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1631436329; bh=onzCTXux0IgMPkgksIFHRmhTNrXy3E0IGSZzmXtGOd0=; h=From:To:Subject:Date; b=TGKSdfI1SzbDUVcW0m/GD9L3rH5l98THerJCx0ijqabOJD8cLtwKNfYK584wy/AdR T+ddU6FGZKSt0t9611CI3TIC3C1q/VOfg1yrU+UFMplI3Dd+O2cvJBv+QjC69orXEe Za6XESx40Vyl8PC0KIszUILdME+7h1w1FCwprP18= Message-Id: <6f76305fbf225bdf781daf83b85a2b6574640a73.1631436303.git.public@yoctocell.xyz> Date: Sun, 12 Sep 2021 10:45:27 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 29 X-Spam_score: 2.9 X-Spam_bar: ++ X-Spam_report: (2.9 / 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, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.494, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (patchutils): Update to 0.4.2. [source]: Remove patch. [inputs]: Add ‘python’. [arguments]<#:phases>: Remove trailing #t. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/patchutils.scm | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) base-commit: f8f94cc5446753b37ab3ddd23e21919efd006769 diff --git a/gnu/local.mk b/gnu/local.mk index 2a56c4a9e2..c99086fcaf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,7 +1568,6 @@ dist_patch_DATA = \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ - %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-cross.patch \ diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index cefced86f2..1f3ea994c3 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2018 Leo Famulari ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,18 +53,19 @@ (define-public patchutils (package (name "patchutils") - (version "0.3.4") + (version "0.4.2") (source (origin - (method url-fetch) - (uri (string-append "http://cyberelk.net/tim/data/patchutils/stable/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg")) - (patches (search-patches "patchutils-test-perms.patch")))) + (method url-fetch) + (uri (string-append "http://cyberelk.net/tim/data/patchutils/stable/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1va5pzmxbzpi87vdnbjm9qdf9bvzps9xfv0gi4mycgg3bybb0xc8")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl))) + (inputs + `(("perl" ,perl) + ("python" ,python))) (arguments '(#:parallel-tests? #f #:phases @@ -71,8 +73,7 @@ (add-before 'check 'patch-test-scripts (lambda _ (substitute* (find-files "tests" "^run-test$") - (("/bin/echo") (which "echo"))) - #t)) + (("/bin/echo") (which "echo"))))) (add-after 'install 'wrap-program ;; Point installed scripts to the utilities they need. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -87,8 +88,7 @@ ,(map (lambda (dir) (string-append dir "/bin")) (list diffutils sed gawk))))) - '("dehtmldiff" "editdiff" "espdiff"))) - #t))))) + '("dehtmldiff" "editdiff" "espdiff")))))))) (home-page "http://cyberelk.net/tim/software/patchutils") (synopsis "Collection of tools for manipulating patch files") (description