From 3c104572a0635156519ff867cef347d9660fa5b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Mar 2018 13:45:10 +0100 Subject: [PATCH] haskell-stylish-cabal: fix build with ghc 8.2.x and 8.4.x --- .../haskell-modules/configuration-ghc-8.2.x.nix | 7 ++++++- .../haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 2531f05cfa9b..f14f0b0ebd19 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -91,7 +91,7 @@ self: super: { text = self.text_1_2_3_0; }); - # Needs Cabal 2.2.x, which is not the default. + # These packages need Cabal 2.2.x, which is not the default. distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; text = self.text_1_2_3_0; @@ -104,5 +104,10 @@ self: super: { Cabal = self.Cabal_2_2_0_0; text = self.text_1_2_3_0; }); + stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); + }))); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index e69165d3c805..9b799cb562e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -797,4 +797,7 @@ self: super: { # https://github.com/haskell/hackage-security/issues/211 hackage-security = doJailbreak super.hackage-security; + # https://github.com/pikajude/stylish-cabal/issues/6 + stylish-cabal = dontHaddock super.stylish-cabal; + }