JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'heist-pandoc' of git://github.com/imalsogreg/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2016-12-05 08:04:24 -05:00
commit b6fe3994be
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -186,6 +186,11 @@ self: super: {
})) }))
else super.hakyll; else super.hakyll;
# Heist's test suite requires system pandoc
heist = overrideCabal super.heist (drv: {
testToolDepends = [pkgs.pandoc];
});
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146. # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;