summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-11-25 23:13:28 +0000
committerLudovic Courtès <ludo@gnu.org>2009-11-25 23:13:28 +0000
commit46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162 (patch)
tree098c4dad504d90163e57bf85dbed58ca3a997ede
parent57fa034f8a77afb892dc7d11a9a637f61c22e992 (diff)
downloadnixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar.gz
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar.bz2
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar.lz
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar.xz
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.tar.zst
nixlib-46526b4ac92ad2f1aa4bcefa41c38c8a4ee63162.zip
Default to Flex 2.5.35; move 2.5.4a out of the way.
svn path=/nixpkgs/trunk/; revision=18633
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc9f9b276718..10e394625889 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2658,7 +2658,7 @@ let
     inherit fetchurl stdenv unzip;
   };
 
-  flex = flex254a;
+  flex = flex2535;
 
   flex2535 = import ../development/tools/parsing/flex/flex-2.5.35.nix {
     inherit fetchurl stdenv yacc m4;
@@ -2672,9 +2672,11 @@ let
     inherit fetchurl stdenv yacc m4;
   };
 
-  flex254a = import ../development/tools/parsing/flex/flex-2.5.4a.nix {
+  # Note: 2.5.4a is much older than 2.5.35 but happens first when sorting
+  # alphabetically, hence the low priority.
+  flex254a = lowPrio (import ../development/tools/parsing/flex/flex-2.5.4a.nix {
     inherit fetchurl stdenv yacc;
-  };
+  });
 
   m4 = gnum4;