stylish-cabal: fix build with GHC 8.4.x (and clean up overrides)

Unfortunately, more recent compiler versions are unable to build this package
because of its dependency on the old haddock-library version.
This commit is contained in:
Peter Simons
2019-01-29 10:59:32 +01:00
parent f20b8bf9b7
commit dd98e07fed
7 changed files with 15 additions and 11 deletions
@@ -1090,10 +1090,6 @@ self: super: {
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
# musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;