diff options
| author | Peter Simons <simons@cryp.to> | 2014-05-05 22:25:10 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-05-05 22:25:19 +0200 |
| commit | d56bbd63644ab6a243bc6fc0714c143d178fc2f6 (patch) | |
| tree | 1c4e606728aa1e56a989daab1ddd2e3cb7ef3303 /pkgs | |
| parent | bfcb131802a1c3d6d88dff7cc5a47b17d86f8cf4 (diff) | |
| download | nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar.gz nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar.bz2 nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar.lz nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar.xz nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.tar.zst nixlib-d56bbd63644ab6a243bc6fc0714c143d178fc2f6.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 11 |
1 files changed, 1 insertions, 10 deletions
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. |