about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-13T12·28+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-13T12·28+0200
commit00c98a6befb70228c7ba2b7d5dc8684289915baa (patch)
treefc42e8ff4886342289a4b97d4b87907fd242c601
parent209927bb2785920eff455adb97ba513080c6e8c0 (diff)
Use Bison 2.5
-rw-r--r--release.nix2
-rw-r--r--src/libexpr/parser.y2
2 files changed, 3 insertions, 1 deletions
diff --git a/release.nix b/release.nix
index 6b571644d994..3f4c4876123f 100644
--- a/release.nix
+++ b/release.nix
@@ -19,7 +19,7 @@ let
         inherit officialRelease;
 
         buildInputs =
-          [ curl bison24 flex2535 perl libxml2 libxslt w3m bzip2
+          [ curl bison25 flex2535 perl libxml2 libxslt w3m bzip2
             tetex dblatex nukeReferences pkgconfig sqlite git
           ];
 
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 449123a1f82c..095e288430f6 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -8,6 +8,8 @@
 %parse-param { ParseData * data }
 %lex-param { yyscan_t scanner }
 %lex-param { ParseData * data }
+%expect 1
+%expect-rr 1
 
 %code requires {