nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: grep: Update to 3.3. 

* gnu/packages/base.scm (grep): Update to 3.3.
[arguments]: Remove 'disable-failing-tests' phase.
This commit is contained in:
Ludovic Courtès 2018-12-24 01:39:17 +01:00
parent ef5821093a
commit b659e97adc
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/base.scm
View File

@ -87,14 +87,14 @@ command-line arguments, multiple languages, and so on.")
(define-public grep (define-public grep
(package (package
(name "grep") (name "grep")
(version "3.1") (version "3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/grep/grep-" (uri (string-append "mirror://gnu/grep/grep-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv")) "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"))
(patches (search-patches "grep-timing-sensitive-test.patch")))) (patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) ;some of the tests require it (native-inputs `(("perl" ,perl))) ;some of the tests require it
@ -102,15 +102,6 @@ command-line arguments, multiple languages, and so on.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'disable-failing-tests
(lambda _
;; These tests are expected to fail due to a glibc bug which has
;; been fixed in 2.28, so they are unexpectedly passing. They
;; should be fixed for grep versions > 3.1.
(substitute* "tests/Makefile.in"
(("^[[:blank:]]+backref-alt[[:blank:]]+\\\\") "\\")
(("^[[:blank:]]+triple-backref[[:blank:]]+\\\\") "\\"))
#t))
(add-after 'install 'fix-egrep-and-fgrep (add-after 'install 'fix-egrep-and-fgrep
;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its
;; absolute file name instead of searching for it in $PATH. ;; absolute file name instead of searching for it in $PATH.