Merge branch 'master' into stdenv-updates.

Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
This commit is contained in:
Peter Simons
2012-11-21 16:20:36 +01:00
841 changed files with 15333 additions and 6120 deletions
@@ -0,0 +1,18 @@
{ cabal, mtl, perl }:
cabal.mkDerivation (self: {
pname = "happy";
version = "1.18.10";
sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1";
isLibrary = false;
isExecutable = true;
buildDepends = [ mtl ];
buildTools = [ perl ];
meta = {
homepage = "http://www.haskell.org/happy/";
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})