JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-nixpkgs.nix: update Cabal to version 1.20.0.2

Browse Source
This commit is contained in:
Peter Simons 2014-07-28 11:51:08 +02:00
parent bde992bbbc
commit eec522e69a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix → pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix
View File

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

4
pkgs/top-level/haskell-defaults.nix
View File

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

8
pkgs/top-level/haskell-packages.nix
View File

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