Skip to content

Commit

Permalink
haskellPackages.hakyll: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
domenkozar committed Jan 5, 2017
1 parent 8f046ce commit 28c0656
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Expand Up @@ -192,7 +192,8 @@ self: super: {
then dontCheck (overrideCabal super.hakyll (drv: {
testToolDepends = [];

This comment has been minimized.

Copy link
@peti

peti Jan 5, 2017

Member

I have a question that's unrelated to your commit, but maybe you can help me understand it anyway. The line above emties testToolDepends, presumably to avoid the dependency on utillinux. Now, when the test suite is disabled by means of dontCheck, then those dependencies shouldn't be evaluated anyway, right? So in my mind, messing with testToolDepends on Darwin is unnecessary. Can you confirm that this is the case? Because if it where, when this override could be simplified even further.

This comment has been minimized.

Copy link
@domenkozar

domenkozar Jan 5, 2017

Author Member

You're correct, but I left it there for future as someday the tests may pass on hakyll again. I'd say it's better to be explicit here about utillinux.

}))
else super.hakyll;
# https://github.com/jaspervdj/hakyll/issues/491
else dontCheck super.hakyll;

# Heist's test suite requires system pandoc
heist = overrideCabal super.heist (drv: {
Expand Down
Expand Up @@ -4075,7 +4075,6 @@ dont-distribute-packages:
hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ]
halberd: [ i686-linux, x86_64-linux, x86_64-darwin ]
halfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]
Expand Down

0 comments on commit 28c0656

Please sign in to comment.