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

haskell-stylish-cabal: fix build with ghc 8.2.x and 8.4.x

Browse Source
This commit is contained in:
Peter Simons
2018-03-11 09:24:37 +01:00
parent 77e974b394
commit 3c104572a0
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+6 -1
View File
@@ -91,7 +91,7 @@ self: super: {
text = self.text_1_2_3_0; 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: { distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: {
Cabal = self.Cabal_2_2_0_0; Cabal = self.Cabal_2_2_0_0;
text = self.text_1_2_3_0; text = self.text_1_2_3_0;
@@ -104,5 +104,10 @@ self: super: {
Cabal = self.Cabal_2_2_0_0; Cabal = self.Cabal_2_2_0_0;
text = self.text_1_2_3_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);
})));
} }
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+3
View File
@@ -797,4 +797,7 @@ self: super: {
# https://github.com/haskell/hackage-security/issues/211 # https://github.com/haskell/hackage-security/issues/211
hackage-security = doJailbreak super.hackage-security; hackage-security = doJailbreak super.hackage-security;
# https://github.com/pikajude/stylish-cabal/issues/6
stylish-cabal = dontHaddock super.stylish-cabal;
} }