swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

cabal-install: fix build after updating to version 2.x

Browse source
This commit is contained in:
Peter Simons 2017-08-08 08:56:20 +02:00
parent 35dd36a027
commit 550373b000
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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