Merge branch 'master.upstream' into staging.upstream

2015-06-30 23:58:07 -07:00
parent 857efa12fb ddf15bc78a
commit 612f0bdd67
71 changed files with 1388 additions and 1461 deletions
@@ -868,9 +868,6 @@ self: super: {
  # https://github.com/DanielG/cabal-helper/issues/2
  cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });

-  # https://github.com/jgm/gitit/issues/494
-  gitit = markBroken super.gitit;
-
  # https://github.com/ekmett/comonad/issues/25
  comonad = dontCheck super.comonad;