hackage-packages.nix: switch our default package set to Stackage Nightly

This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs:

  - Hackage: af161fdf17
  - LTS Haskell: da73308b63
  - Stackage Nightly: 1994a4f865

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

@@ -8,8 +8,8 @@ self: super: {
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
   Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
-  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
-  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
 
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
@@ -170,7 +170,7 @@ self: super: {
   darcs = (overrideCabal super.darcs (drv: {
     doCheck = false;            # The test suite won't even start.
     postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
-  })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
+  }));
 
   # https://github.com/massysett/rainbox/issues/1
   rainbox = dontCheck super.rainbox;

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

@@ -61,8 +61,7 @@ self: super: {
     });
   };
 
-  idris =
-    let idris' = overrideCabal super.idris (drv: {
+  idris = overrideCabal super.idris (drv: {
     # "idris" binary cannot find Idris library otherwise while building.
     # After installing it's completely fine though. Seems like Nix-specific
     # issue so not reported.
@@ -70,10 +69,6 @@ self: super: {
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
   });
-    in idris'.overrideScope (self: super: {
-      # https://github.com/idris-lang/Idris-dev/issues/2500
-      zlib = self.zlib_0_5_4_2;
-    });
 
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";

pkgs/development/haskell-modules/default.nix

@@ -1,4 +1,5 @@
 { pkgs, stdenv, ghc
+, compilerConfig ? (self: super: {})
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
 }:
@@ -77,4 +78,4 @@ let
 
 in
 
-  fix (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides)
+  fix (extend (extend (extend (extend haskellPackages commonConfiguration) compilerConfig) packageSetConfig) overrides)

pkgs/games/hedgewars/default.nix

@@ -5,7 +5,7 @@
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2
+          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib
         ]);
 in
 stdenv.mkDerivation rec {

pkgs/top-level/haskell-packages.nix

@@ -64,43 +64,251 @@ rec {
     ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
     ghc6123 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc6123;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
     };
     ghc704 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc704;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
     };
     ghc722 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc722;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
     };
     ghc742 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc742;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
     };
     ghc763 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc763;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
+    };
+    ghc783 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc783;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
     };
     ghc784 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc784;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
     };
     ghc7102 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc7102;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
     };
     ghcHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcHEAD;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
     ghcNokinds = callPackage ../development/haskell-modules {
       ghc = compiler.ghcNokinds;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
     };
     ghcjs = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjs;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
+
+    lts-0_0 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.0.nix { };
+    };
+
+    lts-0_1 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.1.nix { };
+    };
+
+    lts-0_2 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.2.nix { };
+    };
+
+    lts-0_3 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.3.nix { };
+    };
+
+    lts-0_4 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.4.nix { };
+    };
+
+    lts-0_5 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.5.nix { };
+    };
+
+    lts-0_6 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.6.nix { };
+    };
+
+    lts-0_7 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.7.nix { };
+    };
+
+    lts-1_0 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.0.nix { };
+    };
+
+    lts-1_1 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.1.nix { };
+    };
+
+    lts-1_2 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.2.nix { };
+    };
+
+    lts-1_4 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.4.nix { };
+    };
+
+    lts-1_5 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.5.nix { };
+    };
+
+    lts-1_7 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.7.nix { };
+    };
+
+    lts-1_8 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.8.nix { };
+    };
+
+    lts-1_9 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.9.nix { };
+    };
+
+    lts-1_10 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.10.nix { };
+    };
+
+    lts-1_11 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.11.nix { };
+    };
+
+    lts-1_12 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.12.nix { };
+    };
+
+    lts-1_13 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.13.nix { };
+    };
+
+    lts-1_14 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.14.nix { };
+    };
+
+    lts-1_15 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.15.nix { };
+    };
+
+    lts-2_0 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.0.nix { };
+    };
+
+    lts-2_1 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.1.nix { };
+    };
+
+    lts-2_2 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.2.nix { };
+    };
+
+    lts-2_3 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.3.nix { };
+    };
+
+    lts-2_4 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.4.nix { };
+    };
+
+    lts-2_5 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.5.nix { };
+    };
+
+    lts-2_6 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.6.nix { };
+    };
+
+    lts-2_7 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.7.nix { };
+    };
+
+    lts-2_8 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.8.nix { };
+    };
+
+    lts-2_9 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.9.nix { };
+    };
+
+    lts-2_10 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.10.nix { };
+    };
+
+    lts-2_11 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.11.nix { };
+    };
+
+    lts-2_12 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.12.nix { };
+    };
+
+    lts-2_13 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.13.nix { };
+    };
+
+    lts-2_14 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.14.nix { };
+    };
+
+    lts-2_15 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.15.nix { };
+    };
+
+    lts-2_16 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.16.nix { };
+    };
+
+    lts-2_17 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.17.nix { };
+    };
+
+    lts-2_18 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.18.nix { };
+    };
+
+    lts-2_19 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.19.nix { };
+    };
+
+    lts-2_20 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.20.nix { };
+    };
+
+    lts-2_21 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.21.nix { };
+    };
+
+    lts-2_22 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.22.nix { };
+    };
+
+    lts-3_0 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.0.nix { };
+    };
+
+    lts-3_1 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.1.nix { };
+    };
+
+    lts-3_2 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.2.nix { };
+    };
+
+    lts-3_3 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.3.nix { };
+    };
+
+    lts-3_4 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.4.nix { };
+    };
+
+    lts-3_5 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.5.nix { };
     };
 
   };