summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-12-23 22:49:30 +0100
committerPeter Simons <simons@cryp.to>2014-12-24 09:56:31 +0100
commit157e63c6e6d7f9021eebc604370888642e05c84d (patch)
treec8ca9091f27000be7d0cdfd1eea6511992e16c94 /pkgs/top-level
parent6a236b214a5fc16fe7a2961690cded97f5dfed11 (diff)
downloadnixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar.gz
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar.bz2
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar.lz
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar.xz
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.tar.zst
nixlib-157e63c6e6d7f9021eebc604370888642e05c84d.zip
Update default Haskell compiler from GHC 7.8.3 to 7.8.4.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix11
-rw-r--r--pkgs/top-level/haskell-defaults.nix13
2 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 663fa14d076a..9904eebef268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3352,7 +3352,7 @@ let
     builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
   ) haskell));
 
-  haskellPackages = haskellPackages_ghc783;
+  haskellPackages = haskellPackages_ghc784;
 
   haskellPackages_ghc6104 = haskell.packages_ghc6104;
   haskellPackages_ghc6123 = haskell.packages_ghc6123;
@@ -3360,10 +3360,9 @@ let
   haskellPackages_ghc722  = haskell.packages_ghc722;
   haskellPackages_ghc742  = haskell.packages_ghc742;
   haskellPackages_ghc763  = haskell.packages_ghc763;
-  haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling;
-  haskellPackages_ghc783_profiling    = recurseIntoAttrs haskell.packages_ghc783.profiling;
-  haskellPackages_ghc783              = recurseIntoAttrs haskell.packages_ghc783.highPrio;
-  haskellPackages_ghc784  = haskell.packages_ghc784;
+  haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling;
+  haskellPackages_ghc784_profiling    = recurseIntoAttrs haskell.packages_ghc784.profiling;
+  haskellPackages_ghc784              = recurseIntoAttrs haskell.packages_ghc784.highPrio;
   haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
 
   haxe = callPackage ../development/compilers/haxe { };
@@ -9313,7 +9312,7 @@ let
 
   d4x = callPackage ../applications/misc/d4x { };
 
-  darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs {
+  darcs = with haskellPackages_ghc784; callPackage ../applications/version-management/darcs {
     cabal = cabal.override {
       extension = self : super : {
         enableSharedExecutables = false;
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 1b1ee488cc93..6077c03b800e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,7 +19,7 @@
     mtl = self.mtl_2_2_1;
   };
 
-  ghc783Prefs = self : super : ghcHEADPrefs self super // {
+  ghc784Prefs = self : super : ghcHEADPrefs self super // {
     cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; };
     codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; };
     jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; };
@@ -30,7 +30,7 @@
     }; };
   };
 
-  ghc763Prefs = self : super : ghc783Prefs self super // {
+  ghc763Prefs = self : super : ghc784Prefs self super // {
     aeson = self.aeson_0_7_0_4;
     ariadne = super.ariadne.override {
       haskellNames = self.haskellNames.override {
@@ -226,17 +226,10 @@
                };
              };
 
-  packages_ghc783 =
-    packages { ghcPath = ../development/compilers/ghc/7.8.3.nix;
-               ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary;
-               prefFun = ghc783Prefs;
-             };
-
-
   packages_ghc784 =
     packages { ghcPath = ../development/compilers/ghc/7.8.4.nix;
                ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary;
-               prefFun = ghc783Prefs;
+               prefFun = ghc784Prefs;
              };
 
   packages_ghc763 =