Reverting some more Haskell changes, to make things complete again.

svn path=/nixpkgs/trunk/; revision=34044
This commit is contained in:
Andres Löh 2012-05-10 14:23:48 +00:00
parent 2720636b7b
commit 50a51c7654
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "xhtml";
version = "3000.2.0.5";
sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
meta = {
homepage = "https://github.com/haskell/xhtml";
description = "An XHTML combinator library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -0,0 +1,18 @@
{ cabal, perl, QuickCheck }:
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;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -1522,6 +1522,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {};
xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {};
xhtml_3000_2_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.1.nix {};
xhtml = self.xhtml_3000_2_1;
@ -1605,6 +1606,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_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;