diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 16:02:16 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 16:31:52 +0100 |
| commit | e02671939bcc4a38e13f68f58d4cb531150dde81 (patch) | |
| tree | 6e18f5abd93b5c4a4345a3b4dd32685086dd0a42 /gnu/packages/acl.scm | |
| parent | ceb831d33841d47f4b92c07829df9134853c83d0 (diff) | |
| download | guix-patches-e02671939bcc4a38e13f68f58d4cb531150dde81.tar guix-patches-e02671939bcc4a38e13f68f58d4cb531150dde81.tar.gz | |
gnu: acl: Update to 2.2.53.
* gnu/packages/patches/acl-hurd-path-max.patch,
gnu/packages/patches/acl-fix-perl-regex.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/acl.scm (acl): Update to 2.2.53.
[source](uri): Adjust for renamed tarball.
[arguments]: Remove #:test-target. Adjust disabled tests. Don't override
install phase.
Diffstat (limited to 'gnu/packages/acl.scm')
| -rw-r--r-- | gnu/packages/acl.scm | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 8d5f0117f5..0131adcac4 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,21 +35,18 @@ (define-public acl (package (name "acl") - (version "2.2.52") + (version "2.2.53") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/acl/acl-" - version ".src.tar.gz")) + version ".tar.gz")) (sha256 (base32 - "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p")) - (patches (search-patches "acl-fix-perl-regex.patch" - "acl-hurd-path-max.patch")))) + "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6")))) (build-system gnu-build-system) (arguments - `(#:test-target "tests" - #:modules ((ice-9 ftw) + `(#:modules ((ice-9 ftw) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -75,13 +73,11 @@ (("\\| sed.*'") "")) ;; These tests require the existence of a user named "bin", but ;; this user does not exist within Guix's build environment. - (for-each (lambda (file) - (delete-file (string-append "test/" file))) - '("setfacl-X.test" "cp.test" "misc.test")) - #t)) - (replace 'install - (lambda _ - (invoke "make" "install" "install-lib" "install-dev")))))) + (substitute* "Makefile.in" + ((".*test/misc\\.test.*") "") + ((".*test/cp\\.test.*") "") + ((".*test/setfacl-X\\.test.*") "")) + #t))))) (inputs `(("attr" ,attr))) (native-inputs `(("gettext" ,gettext-minimal) |