From d56bbd63644ab6a243bc6fc0714c143d178fc2f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 May 2014 22:25:10 +0200 Subject: haskell-defaults.nix: let ghc-7.8.2 use the HEAD prefs for the time being The whole notion of per-compiler HP-compliant environments has failed anyway and I'll try to get rid of that ASAP, so it feels pointless to configure that stuff for GHC 7.8.2 to begin with. --- pkgs/top-level/haskell-defaults.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 64478328921a..9c6741c124a5 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,15 +21,6 @@ extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; - ghc782Prefs = - self : self.haskellPlatformArgs_future self // { - haskellPlatform = null; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; - cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - binary_0_7_1_0 = null; - }; - ghc763Prefs = self : self.haskellPlatformArgs_2013_2_0_0 self // { haskellPlatform = self.haskellPlatform_2013_2_0_0; @@ -405,7 +396,7 @@ packages_ghc782 = packages { ghcPath = ../development/compilers/ghc/7.8.2.nix; ghcBinary = ghc742Binary; - prefFun = ghc782Prefs; + prefFun = ghcHEADPrefs; }; # Reasonably current HEAD snapshot. Should *always* be lowPrio. -- cgit 1.4.1