Skip to content

Commit

Permalink
haskell-Cabal: update to version 1.20.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
peti committed Jun 9, 2014
1 parent 71ecdfb commit c9672d7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.20.0.0";
sha256 = "1m2lp6v1959mdm9zfg6fg1xw2iv749r4rzj576lqvn66slwsjpw1";
version = "1.20.0.1";
sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m";
buildDepends = [ deepseq filepath time ];
testDepends = [
extensibleExceptions filepath HUnit QuickCheck regexPosix
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/haskell-defaults.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
};

ghc782Prefs = self : super : ghcHEADPrefs self super // {
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; }; };
cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; };
codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; };
};

ghc763Prefs = self : super : ghc782Prefs self super // {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/haskell-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,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_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {};
Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {};
Cabal = null; # core package since forever

cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
Expand Down Expand Up @@ -2740,7 +2740,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_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; };
cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; };
cabalInstall = self.cabalInstall_1_20_0_2;

codex = callPackage ../development/tools/haskell/codex {};
Expand Down

0 comments on commit c9672d7

Please sign in to comment.