diff options
| author | Peter Simons <simons@cryp.to> | 2014-12-18 18:36:49 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-12-18 18:36:49 +0100 |
| commit | fa165e137d28ef5428f13b6b93750a9ef5b840f3 (patch) | |
| tree | 3cf74cee3ce3fe85198a7a07dc2bbc7aee4c8f28 /pkgs/top-level | |
| parent | f7384b8c75a17689aca3a53617b937e1bf67b417 (diff) | |
| download | nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar.gz nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar.bz2 nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar.lz nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar.xz nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.tar.zst nixlib-fa165e137d28ef5428f13b6b93750a9ef5b840f3.zip | |
cabal-install: update to version 1.20.0.4
The test suite had to be disabled because of https://github.com/haskell/cabal/issues/2285.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9edabc13037f..538686b73ac4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,13 +15,13 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; transformersCompat = super.transformersCompat_0_3_3; }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51b53743e94f..9c5110e48433 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3148,11 +3148,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { - HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; - Cabal = self.Cabal_1_20_0_2; - }; - cabalInstall = self.cabalInstall_1_20_0_3; + cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall = self.cabalInstall_1_20_0_4; codex = callPackage ../development/tools/haskell/codex {}; |