diff options
| author | Peter Simons <simons@cryp.to> | 2017-08-08 08:56:20 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-08-08 10:09:56 +0200 |
| commit | 550373b000b6afdd268007a8ce70265a97ba61e2 (patch) | |
| tree | c601a7024fbf3629252baa213d681ab9c2ebbc09 | |
| parent | 35dd36a027c5421c62b883a948effbcf846af9af (diff) | |
| download | nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar.gz nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar.bz2 nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar.lz nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar.xz nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.tar.zst nixpkgs-550373b000b6afdd268007a8ce70265a97ba61e2.zip | |
cabal-install: fix build after updating to version 2.x
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0d2f235862f..069213c8798 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,8 +27,10 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); + # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with + # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 4a09b142d2e..ffa7030d98b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -36,9 +36,6 @@ self: super: { unix = null; xhtml = null; - # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); - # Build jailbreak-cabal with the latest version of Cabal. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index a24d2bcd4c1..ade4d5e915d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -35,9 +35,6 @@ self: super: { unix = null; xhtml = null; - # cabal-install can use the native Cabal library. - cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; |