diff options
author | Peter Simons <simons@cryp.to> | 2014-05-24 10:42:07 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-05-24 10:42:07 +0200 |
commit | 19c4909124625e86c3780640a839fdbb207d3cc8 (patch) | |
tree | 4dad1cd050a054aca9e3973601300612ab4ae410 /pkgs | |
parent | 6da85d3cf6690747592346492a091e761ec543fd (diff) |
cabal-install: update to version 1.20.0.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/package-management/cabal-install/1.20.0.2.nix (renamed from pkgs/tools/package-management/cabal-install/1.20.0.1.nix) | 4 | ||||
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix index d0db9354ae053..dba92ab9321b0 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.1"; - sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi"; + version = "1.20.0.2"; + sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 708fe3271a6ca..ad0da2265421a 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -16,11 +16,11 @@ ghcHEADPrefs = self : super : super // { mtl = self.mtl_2_1_3_1; - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 36b22b935ce1e..2f24f206dfb98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2689,8 +2689,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; 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_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; - cabalInstall = self.cabalInstall_1_20_0_1; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall = self.cabalInstall_1_20_0_2; codex = callPackage ../development/tools/haskell/codex {}; |