From 94d2d0b7f861803c6670252253e97b266de5514b Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 12 Sep 2021 10:45:27 +0200 Subject: [PATCH] gnu: patchutils: Update to 0.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/patchutils.scm | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index a7255e8df7..fe8bb195a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1569,7 +1569,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 8758fb0e8f..6eaf0e371c 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-module (gnu packages patchutils) (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 @@ (define-public patchutils (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 @@ (define-public patchutils ,(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