From 773c5a04e4bcf357499ed9c74853a3c3efa5add0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Feb 2013 11:35:36 +0100
Subject: [PATCH] haskell-alex: update to version 3.0.4

---
 pkgs/development/tools/parsing/alex/3.0.4.nix | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/alex/3.0.4.nix

diff --git a/pkgs/development/tools/parsing/alex/3.0.4.nix b/pkgs/development/tools/parsing/alex/3.0.4.nix
new file mode 100644
index 00000000000..bc82079aa79
--- /dev/null
+++ b/pkgs/development/tools/parsing/alex/3.0.4.nix
@@ -0,0 +1,18 @@
+{ cabal, perl, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "alex";
+  version = "3.0.4";
+  sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ QuickCheck ];
+  buildTools = [ perl ];
+  meta = {
+    homepage = "http://www.haskell.org/alex/";
+    description = "Alex is a tool for generating lexical analysers in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b2b7915eb63..91e51b694fb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -147,7 +147,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
     zlib         = self.zlib_0_5_4_0;           # 7.6 ok
     cabalInstall = self.cabalInstall_1_16_0_2;  # 7.6 ok
-    alex         = self.alex_3_0_2;             # 7.6 ok
+    alex         = self.alex_3_0_4;             # 7.6 ok
     haddock      = self.haddock_2_13_1;         # 7.6 ok
     happy        = self.happy_1_18_10;          # 7.6 ok
     primitive    = self.primitive_0_5_0_1; # semi-official, but specified
@@ -1948,7 +1948,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
   alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
   alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {};
-  alex = self.alex_3_0_2;
+  alex_3_0_4 = callPackage ../development/tools/parsing/alex/3.0.4.nix {};
+  alex = self.alex_3_0_4;
 
   alexMeta = callPackage ../development/tools/haskell/alex-meta {};