diff options
| author | Peter Simons <simons@cryp.to> | 2018-04-28 12:32:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-04-28 15:37:59 +0200 |
| commit | f0549be090185a07da2be4b26f654a487c45243f (patch) | |
| tree | 6a84d8bf32d8941e7978fa405a19c80641c4bd93 | |
| parent | c60c6a2443ab45169996aba33ae883622bbc1026 (diff) | |
| download | nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar.gz nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar.bz2 nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar.lz nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar.xz nixlib-f0549be090185a07da2be4b26f654a487c45243f.tar.zst nixlib-f0549be090185a07da2be4b26f654a487c45243f.zip | |
haskell-stack: update overrides for the new 1.7.1 version
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82ac96d2c85d..ec8e7a1bc2b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; }); 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 b6fdb75e5506..d1bb60e83958 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -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); |