gnu: ack: Modernize package and add input.

* gnu/packages/textutils.scm (ack): Use gexps and fix indentation.
[inputs]: Add perl.

Change-Id: I486434ed0a3d7a8da01d4ce070bb7c7234a04788
Signed-off-by: Andreas Enge <andreas@enge.fr>

1 files changed, 37 insertions, 33 deletions

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index ba647ed3c46..a269ea2c2dd 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1921,41 +1921,45 @@ conversion and pretty-printing.")
   (package
     (name "ack")
     (version "3.7.0")
-    (source (origin
-              (method git-fetch)
-              (uri
-               (git-reference
-                (url "https://github.com/beyondgrep/ack3")
-                (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "0xrbgjj3nys4158nskd0npqf825xlrqa2x3fqcfz0nnxai2jzbck"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+          (url "https://github.com/beyondgrep/ack3")
+          (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xrbgjj3nys4158nskd0npqf825xlrqa2x3fqcfz0nnxai2jzbck"))))
     (build-system perl-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'patch-generated-file-shebangs 'patch-more-shebangs
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((perl (string-append
-                          (assoc-ref inputs "perl")
-                          "/bin/perl"))
-                   (site-perl
-                    (lambda (input)
-                      (format #false "~a/lib/perl5/site_perl/~a"
-                              input
-                              ,(package-version perl)))))
-               (substitute* "t/ack-type.t"
-                 (("/usr/bin/perl") perl)
-                 (("/usr/bin/env perl") perl))
-               (substitute* "ack"
-                 (("/bin/perl") ;; add @INC include directories to perl calls
-                  (string-append "/bin/perl -I "
-                                 (site-perl
-                                  (assoc-ref inputs "perl-file-next"))
-                                 " -I "
-                                 (site-perl
-                                  (assoc-ref outputs "out")))))))))))
-    (inputs (list perl-file-next))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'patch-generated-file-shebangs 'patch-more-shebangs
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((perl (string-append
+                           #$(this-package-input "perl")
+                           "/bin/perl"))
+                    (site-perl
+                     (lambda (input)
+                       (format #false "~a/lib/perl5/site_perl/~a"
+                               input
+                               #$(package-version perl)))))
+                (substitute* "t/ack-type.t"
+                  (("/usr/bin/perl") perl)
+                  (("/usr/bin/env perl") perl))
+                ;; Add @INC include directories to perl calls
+                (substitute* "ack"
+                  (("/bin/perl")
+                   (string-append "/bin/perl"
+                                  " -I "
+                                  (site-perl #$(this-package-input perl-file-next))
+                                  " -I "
+                                  (site-perl #$output))))))))))
+    (inputs
+     (list perl
+           perl-file-next))
     (home-page "https://beyondgrep.com/")
     (synopsis "Code-searching tool for programmers with large source trees")
     (description "ack is a tool for finding text inside files.  It is designed for