diff options
Diffstat (limited to 'gnu/packages/gawk.scm')
| -rw-r--r-- | gnu/packages/gawk.scm | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index d8494e9c1c..1935e73ab7 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <[email protected]> ;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]> ;;; Copyright © 2018 Efraim Flashner <[email protected]> +;;; Copyright © 2021 Marius Bakke <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,13 +31,13 @@ (define-public gawk (package (name "gawk") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf")))) + (base32 "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -55,9 +56,7 @@ '((substitute* "extension/Makefile.in" (("^.*: check-for-shared-lib-support" match) (string-append "### " match)))) - '()) - - #t))) + '())))) (add-before 'check 'adjust-test-infrastructure (lambda _ @@ -66,18 +65,26 @@ (substitute* "test/Makefile" (("\\| more") "")) + ;; Silence a warning from bash about not being able + ;; to change to an ISO-8859-1 locale. The test itself + ;; works fine, but newer versions of bash give a + ;; locale warning which mangles the test output. + (substitute* "test/localenl.sh" + (("for LC_ALL in") + "for LC in") + (("export LC_ALL\n") + "export LC_ALL=$LC 2>/dev/null\n")) + ;; Adjust the shebang in that file since it is then diff'd ;; against the actual test output. (substitute* "test/watchpoint1.ok" (("#! /usr/bin/gawk") - (string-append "#!" (which "gawk")))) - #t))))) - - (inputs `(("libsigsegv" ,libsigsegv) + (string-append "#!" (which "gawk"))))))))) - ,@(if (%current-target-system) - `(("bash" ,bash)) - '()))) + (inputs (list libsigsegv + ;; Use the full-fledged Bash package, otherwise the test suite + ;; sometimes fail non-deterministically. + bash)) (home-page "https://www.gnu.org/software/gawk/") (synopsis "Text scanning and processing language") @@ -87,3 +94,30 @@ language for the easy manipulation of formatted text, such as tables of data. Gawk features many extensions beyond the traditional implementation, including network access, sorting, and large libraries.") (license gpl3+))) + +(define-public mawk + (package + (name "mawk") + (version "1.3.4-20200120") + (home-page "https://invisible-island.net/mawk/mawk.html") + (source (origin + (method url-fetch) + (uri (string-append "https://invisible-mirror.net/archives/mawk" + "/mawk-" version ".tgz")) + (sha256 + (base32 + "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Prevent tests from hard coding PATH to a bogus value. + (substitute* '("test/mawktest" "test/fpe_test") + (("^PATH=.*") + "")))))) + (build-system gnu-build-system) + (synopsis "Text scanning and processing language") + (description + "@command{mawk} is an interpreter for the Awk programming language. +This version aims to be smaller and faster than GNU Awk, at the expense +of fewer features and extensions.") + (license gpl2))) ;version 2 only |