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

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.
This commit is contained in:
Efraim Flashner 2016-01-07 08:42:15 +02:00
parent bfcb7bcb73
commit 93b3a8b0ee
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -463,7 +463,6 @@ dist_patch_DATA = \
gnu/packages/patches/findutils-localstatedir.patch \ gnu/packages/patches/findutils-localstatedir.patch \
gnu/packages/patches/findutils-test-xargs.patch \ gnu/packages/patches/findutils-test-xargs.patch \
gnu/packages/patches/flashrom-use-libftdi1.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \
gnu/packages/patches/flex-bison-tests.patch \
gnu/packages/patches/flint-ldconfig.patch \ gnu/packages/patches/flint-ldconfig.patch \
gnu/packages/patches/fltk-shared-lib-defines.patch \ gnu/packages/patches/fltk-shared-lib-defines.patch \
gnu/packages/patches/freeimage-CVE-2015-0852.patch \ gnu/packages/patches/freeimage-CVE-2015-0852.patch \

6
gnu/packages/flex.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,15 +32,14 @@
(define flex (define flex
(package (package
(name "flex") (name "flex")
(version "2.5.37") (version "2.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/flex/flex-" (uri (string-append "mirror://sourceforge/flex/flex-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0ah5mi4j62b85a9rllv1004mzjb5cd0mn4glvz13p88rpx77pahp")) "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"))))
(patches (list (search-patch "flex-bison-tests.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(let ((bison-for-tests (let ((bison-for-tests

24
gnu/packages/patches/flex-bison-tests.patch
View File

@ -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"