hackage-packages.nix: re-generate from Hackage 2015-01-22T21:38:10+0100

This commit also implements the second part of the
4f603d1ca0
hack to work around https://github.com/NixOS/cabal2nix/issues/136

Fixes https://github.com/NixOS/nixpkgs/issues/5902.

pkgs/development/haskell-modules/configuration-common.nix

@@ -16,7 +16,6 @@ self: super: {
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
-  matlab = super.matlab.override { matlab = null; };
   mwc-random = dontCheck super.mwc-random;
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
@@ -149,9 +148,8 @@ self: super: {
     })];});
 
   # https://github.com/NixOS/cabal2nix/issues/136
-  gio = overrideCabal (super.gio.override { glib = self.glib; }) (drv: { pkgconfigDepends = [pkgs.glib]; });
-  glade = overrideCabal super.gio (drv: { pkgconfigDepends = [pkgs.gtk2]; buildDepends = drv.buildDepends ++ [self.glib]; });
-  pango = super.pango.override { cairo = self.cairo; };
+  gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
+  glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
 
   # https://github.com/jgm/zip-archive/issues/21
   zip-archive = addBuildTool super.zip-archive pkgs.zip;

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

@@ -38,7 +38,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_2_3;
+  binary = self.binary_0_7_3_0;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;

pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix

@@ -32,7 +32,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_2_3;
+  binary = self.binary_0_7_3_0;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_0_0;

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

@@ -40,7 +40,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; process = self.process_1_2_1_0; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_1_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

@@ -37,7 +37,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -40,7 +40,7 @@ self: super: {
   terminfo = self.terminfo_0_4_0_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -55,7 +55,7 @@ self: super: {
   aeson = self.aeson_0_7_0_6;
 
   # The test suite depends on time >=1.4.0.2.
-  cookie = dontCheck super.cookie ;
+  cookie = dontCheck super.cookie;
 
   # Work around bytestring >=0.10.2.0 requirement.
   streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;