aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-12-24 01:39:17 +0100
committerLudovic Courtès <ludo@gnu.org>2018-12-24 01:39:17 +0100
commitb659e97adc462b221692696b641602a5873902b0 (patch)
tree4c3b995f57e0e5b7295713ee7aa4579fa835a4f2 /gnu
parentef5821093adfddf80ec472652b6b00439412fa47 (diff)
downloadpatches-b659e97adc462b221692696b641602a5873902b0.tar
patches-b659e97adc462b221692696b641602a5873902b0.tar.gz
gnu: grep: Update to 3.3.
* gnu/packages/base.scm (grep): Update to 3.3. [arguments]: Remove 'disable-failing-tests' phase.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/base.scm13
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 127ac7a75f..663d3d8692 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -87,14 +87,14 @@ command-line arguments, multiple languages, and so on.")
(define-public grep
(package
(name "grep")
- (version "3.1")
+ (version "3.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/grep/grep-"
version ".tar.xz"))
(sha256
(base32
- "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"))
+ "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"))
(patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) ;some of the tests require it
@@ -102,15 +102,6 @@ command-line arguments, multiple languages, and so on.")
(arguments
`(#: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
;; Patch 'egrep' and 'fgrep' to execute 'grep' via its
;; absolute file name instead of searching for it in $PATH.