ragel: add stable version, default to stable

2 files changed, 43 insertions, 26 deletions

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index e54d4c540fe2..05546da67f01 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,30 +1,46 @@
-{stdenv, fetchurl, transfig, tex , ghostscript, colm,  build-manual ? false
+{ stdenv, fetchurl, transfig, tex, ghostscript, colm
+, build-manual ? false
 }:
 
-stdenv.mkDerivation rec {
-  name = "ragel-${version}";
-  version = "7.0.0.9";
+let
+  generic = { version, sha256 }:
+    stdenv.mkDerivation rec {
+      name = "ragel-${version}";
 
-  src = fetchurl {
-    url = "http://www.colm.net/files/ragel/${name}.tar.gz";
-    sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
+      src = fetchurl {
+        url = "http://www.colm.net/files/ragel/${name}.tar.gz";
+        inherit sha256;
+      };
+
+      buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
+
+      preConfigure = stdenv.lib.optional build-manual ''
+        sed -i "s/build_manual=no/build_manual=yes/g" DIST
+      '';
+
+      configureFlags = [ "--with-colm=${colm}" ];
+
+      doCheck = true;
+
+      meta = with stdenv.lib; {
+        homepage = http://www.complang.org/ragel;
+        description = "State machine compiler";
+        license = licenses.gpl2;
+        platforms = platforms.unix;
+        maintainers = with maintainers; [ pSub ];
+      };
+    };
+
+in
+
+{
+  ragelStable = generic {
+    version = "6.9";
+    sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
   };
 
-  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
-   
-  preConfigure = stdenv.lib.optional build-manual ''
-    sed -i "s/build_manual=no/build_manual=yes/g" DIST
-  '';
-
-  configureFlags = [ "--with-colm=${colm}" ];
-
-  doCheck = true;
-  
-  meta = with stdenv.lib; {
-    homepage = http://www.complang.org/ragel;
-    description = "State machine compiler";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ pSub ];
+  ragelDev = generic {
+    version = "7.0.0.9";
+    sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e782cd3cdde..6d1dbc3c607c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6438,10 +6438,11 @@ in
     luaBindings = config.radare.luaBindings or false;
   };
 
+  ragel = ragelStable;
 
-  ragel = callPackage ../development/tools/parsing/ragel {
-    tex = texlive.combined.scheme-small;
-  };
+  inherit (callPackages ../development/tools/parsing/ragel {
+      tex = texlive.combined.scheme-small;
+    }) ragelStable ragelDev;
 
   hammer = callPackage ../development/tools/parsing/hammer { };