b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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:41:34 +01:00
parent f20b8bf9b7
commit dd98e07fed
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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;

7
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file

@ -91,12 +91,11 @@ self: super: {
distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
Cabal = self.Cabal_2_2_0_1;
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
# GHC 8.2 doesn't have semigroups included by default
ListLike = addBuildDepend super.ListLike self.semigroups;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

5
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file

@ -71,4 +71,9 @@ self: super: {
yaml = self.yaml_0_11_0_0;
};
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: {
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
}

3
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file

@ -68,4 +68,7 @@ self: super: {
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
stack = doJailbreak super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

3
pkgs/development/haskell-modules/configuration-ghc-head.nix
View file

@ -79,4 +79,7 @@ self: super: {
# Fix build with ghc 8.6.x.
git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

3
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -2367,9 +2367,6 @@ extra-packages:
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle
- hspec < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
- hspec-core < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
- hspec-discover < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
- html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
- http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
- inline-c < 0.6 # required on GHC 8.0.x

1
pkgs/top-level/all-packages.nix
View file

@ -6993,6 +6993,7 @@ in
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc844.stylish-cabal;
all-cabal-hashes = callPackage ../data/misc/hackage { };