[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: flex: Update to 2.6.0.
From: |
Efraim Flashner |
Subject: |
01/01: gnu: flex: Update to 2.6.0. |
Date: |
Thu, 07 Jan 2016 06:48:37 +0000 |
efraim pushed a commit to branch core-updates
in repository guix.
commit 93b3a8b0eeabeca960a178754589c6461b38baf5
Author: Efraim Flashner <address@hidden>
Date: Thu Jan 7 08:42:15 2016 +0200
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.
---
gnu-system.am | 1 -
gnu/packages/flex.scm | 6 +++---
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 7fb1089..0f0fabc 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 7988e93..f8d5ccd 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 <address@hidden>
+;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;;
;;; 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 0f372f8..0000000
--- 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"
-