gnu: patchutils: Update to 0.4.2.

* 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 <ludo@gnu.org>
This commit is contained in:
Xinglu Chen 2021-09-12 10:45:27 +02:00 committed by Ludovic Courtès
parent 3d15a19874
commit 94d2d0b7f8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 14 deletions

View file

@ -1569,7 +1569,6 @@ dist_patch_DATA = \
%D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \
%D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.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/patch-hurd-path-max.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-cross.patch \ %D%/packages/patches/perl-cross.patch \

View file

@ -3,6 +3,7 @@
;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -52,7 +53,7 @@ (define-module (gnu packages patchutils)
(define-public patchutils (define-public patchutils
(package (package
(name "patchutils") (name "patchutils")
(version "0.3.4") (version "0.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -60,10 +61,11 @@ (define-public patchutils
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg")) "1va5pzmxbzpi87vdnbjm9qdf9bvzps9xfv0gi4mycgg3bybb0xc8"))))
(patches (search-patches "patchutils-test-perms.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl))) (inputs
`(("perl" ,perl)
("python" ,python)))
(arguments (arguments
'(#:parallel-tests? #f '(#:parallel-tests? #f
#:phases #:phases
@ -71,8 +73,7 @@ (define-public patchutils
(add-before 'check 'patch-test-scripts (add-before 'check 'patch-test-scripts
(lambda _ (lambda _
(substitute* (find-files "tests" "^run-test$") (substitute* (find-files "tests" "^run-test$")
(("/bin/echo") (which "echo"))) (("/bin/echo") (which "echo")))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
;; Point installed scripts to the utilities they need. ;; Point installed scripts to the utilities they need.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -87,8 +88,7 @@ (define-public patchutils
,(map (lambda (dir) ,(map (lambda (dir)
(string-append dir "/bin")) (string-append dir "/bin"))
(list diffutils sed gawk))))) (list diffutils sed gawk)))))
'("dehtmldiff" "editdiff" "espdiff"))) '("dehtmldiff" "editdiff" "espdiff"))))))))
#t)))))
(home-page "http://cyberelk.net/tim/software/patchutils") (home-page "http://cyberelk.net/tim/software/patchutils")
(synopsis "Collection of tools for manipulating patch files") (synopsis "Collection of tools for manipulating patch files")
(description (description