diff options
| author | Peter Simons <simons@cryp.to> | 2014-07-28 11:51:08 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-07-28 20:32:52 +0200 |
| commit | eec522e69acde44e6dac25e4175b26cc51436346 (patch) | |
| tree | 20a008b0a53dddbf0b0d3698e76d652511b382df | |
| parent | bde992bbbc7148255d439cbb8b54a772b81e89eb (diff) | |
| download | nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar.gz nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar.bz2 nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar.lz nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar.xz nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.tar.zst nixpkgs-eec522e69acde44e6dac25e4175b26cc51436346.zip | |
haskell-nixpkgs.nix: update Cabal to version 1.20.0.2
| -rw-r--r-- | pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix (renamed from pkgs/development/libraries/haskell/Cabal/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 | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix index 67faefb7a67..35d0ddfd330 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.1"; - sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m"; + version = "1.20.0.2"; + sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a81f8cae90a..95894faa1a8 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,8 +21,8 @@ }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; mtl = self.mtl_2_1_2; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e587dbf9ab..46333dc4641 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -334,7 +334,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; + Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; Cabal = null; # core package since forever cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; @@ -2932,9 +2932,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; cabalLenses = self.cabalLenses.override { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; }; }; @@ -2951,7 +2951,7 @@ 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_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_1; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; cabalInstall = self.cabalInstall_1_20_0_3; codex = callPackage ../development/tools/haskell/codex {}; |