diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-01-07 08:42:15 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-01-07 08:42:15 +0200 |
| commit | 93b3a8b0eeabeca960a178754589c6461b38baf5 (patch) | |
| tree | d0514815085e9448adca28a41492dcef4570f15f | |
| parent | bfcb7bcb739c6c0cc5c564b5f2bc94e0aa33a556 (diff) | |
| download | patches-93b3a8b0eeabeca960a178754589c6461b38baf5.tar patches-93b3a8b0eeabeca960a178754589c6461b38baf5.tar.gz | |
gnu: flex: Update to 2.6.0.
* gnu/packages/flex.scm (flex): Update to 2.6.0.
[source]: Remove flex-bison-tests.patch.
* gnu-system.am (dist_patch_DATA): Remove flex-bison-tests.patch.
* gnu/packages/patches/flex-bison-tests.patch: Remove it.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/flex.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/flex-bison-tests.patch | 24 |
3 files changed, 3 insertions, 28 deletions
diff --git a/gnu-system.am b/gnu-system.am index 7fb1089c66..0f0fabc302 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -463,7 +463,6 @@ dist_patch_DATA = \ gnu/packages/patches/findutils-localstatedir.patch \ gnu/packages/patches/findutils-test-xargs.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \ - gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/flint-ldconfig.patch \ gnu/packages/patches/fltk-shared-lib-defines.patch \ gnu/packages/patches/freeimage-CVE-2015-0852.patch \ diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 7988e930e7..f8d5ccd032 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,15 +32,14 @@ (define flex (package (name "flex") - (version "2.5.37") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/flex/flex-" version ".tar.bz2")) (sha256 (base32 - "0ah5mi4j62b85a9rllv1004mzjb5cd0mn4glvz13p88rpx77pahp")) - (patches (list (search-patch "flex-bison-tests.patch"))))) + "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4")))) (build-system gnu-build-system) (inputs (let ((bison-for-tests diff --git a/gnu/packages/patches/flex-bison-tests.patch b/gnu/packages/patches/flex-bison-tests.patch deleted file mode 100644 index 0f372f83bf..0000000000 --- a/gnu/packages/patches/flex-bison-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -The `test-bison-yyl{loc,val}' tests fail with "conflicting types for -'testparse'" because `YYPARSE_PARAM' is undefined; work around that. - ---- flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:01.000000000 +0100 -+++ flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:07.000000000 +0100 -@@ -21,6 +21,7 @@ - * PURPOSE. - */ - -+#define YYPARSE_PARAM scanner - #include "parser.h" - #include "scanner.h" - - ---- flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:42.000000000 +0100 -+++ flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:49.000000000 +0100 -@@ -21,6 +21,7 @@ - * PURPOSE. - */ - -+#define YYPARSE_PARAM scanner - #include "parser.h" - #include "scanner.h" - |