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

haskell-stack: update overrides for the new 1.7.1 version

Browse Source
This commit is contained in:
Peter Simons 2018-04-28 12:32:01 +02:00
parent c60c6a2443
commit f0549be090
2 changed files with 5 additions and 4 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

@ -863,8 +863,8 @@ self: super: {
testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
});
# https://github.com/fpco/stackage/issues/3126
stack = doJailbreak super.stack;
# Needs newer versions than what we have in LTS-11.x at the moment.
stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; });
# These packages depend on each other, forming an infinite loop.
scalendar = markBroken (super.scalendar.override { SCalendar = null; });

5
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -84,10 +84,11 @@ self: super: {
purescript = doJailbreak (super.purescript);
# 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_1; });
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
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);