diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-04-07 10:37:55 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-04-07 10:37:55 -0500 |
| commit | 8f702347a261d253c798f2da6a516391d0375918 (patch) | |
| tree | d2459da4d1f4451e0596ac5d6873b44fef38af44 /pkgs | |
| parent | 54bf1360c1ea4053d1b0a1ac0d792368fcd81a45 (diff) | |
| parent | fad17a9ace5ac797ef0c1bbfd16c29e426727e1d (diff) | |
| download | nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar.gz nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar.bz2 nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar.lz nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar.xz nixpkgs-8f702347a261d253c798f2da6a516391d0375918.tar.zst nixpkgs-8f702347a261d253c798f2da6a516391d0375918.zip | |
Merge pull request #7169 from cstrahan/hakyll-ghc710-fix
hakyll: fix on GHC 7.10
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d93b84be004..de768fa67b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -134,6 +134,17 @@ self: super: { ''; }); + # see: https://github.com/jaspervdj/hakyll/issues/343 + hakyll = overrideCabal super.hakyll (drv: { + buildDepends = drv.buildDepends ++ [ self.time-locale-compat ]; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/pull/344.patch"; + sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli"; + }) + ]; + }); + # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); |