diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix new file mode 100644 index 000000000000..90d6df1a50a9 --- /dev/null +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -0,0 +1,16 @@ +{ cabal, QuickCheck, perl }: + +cabal.mkDerivation (self: { + pname = "alex"; + version = "3.0.1"; + sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; + 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; + }; +}) diff --git a/pkgs/development/tools/parsing/alex/3.0.nix b/pkgs/development/tools/parsing/alex/3.0.nix deleted file mode 100644 index b071036293af..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, perl, QuickCheck2}: - -cabal.mkDerivation (self : { - pname = "alex"; - version = "3.0"; # Haskell Platform future? - name = self.fname; - sha256 = "0vjm58xb64lvhd7h3cfgrm81630pl2avz6v98323s6i9jsizi8js"; - extraBuildInputs = [perl QuickCheck2]; - meta = { - description = "A lexical analyser generator for Haskell"; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3cc224eb0d6d..6165aadd4dd2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -148,7 +148,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails - alex = self.alex_3_0; # 7.2 ok, 7.3 ok + alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok happy = self.happy_1_18_6; # 7.2 ok, 7.3 ok haddock = self.haddock_2_9_2; # 7.2 fails, 7.3 fails }; @@ -1365,7 +1365,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; - alex_3_0 = callPackage ../development/tools/parsing/alex/3.0.nix {}; + alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex = self.alex_2_3_1; alexMeta = callPackage ../development/tools/haskell/alex-meta {};