Merge master into stdenv-updates

Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
  isExecutable = true;
  buildDepends = [ mtl ];
  buildTools = [ perl ];
+  patchPhase = "sed -i -e '/^import Data.Monoid/d' Setup.lhs";
  meta = {
    homepage = "http://www.haskell.org/happy/";
    description = "Happy is a parser generator for Haskell";