From c564997ba0372147a2b0f376073fdfdd37306152 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Tue, 26 Jul 2016 16:58:56 -0400 Subject: ghcjs: refactor stage2 handling Previously, the stage2 information was stored in haskell-modules, and imported directly from there. However, the correct stage2 information is determined by the version of ghcjs-boot repository. This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index d75a7f889aad..fffe29b1bc37 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -9,11 +9,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: # The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb - let stage2 = - (import ./ghcjs/stage2.nix { + let stage2 = super.ghc.mkStage2 { inherit (self) callPackage; - inherit (self.ghc) ghcjsBoot; - }); in stage2 // { + }; in stage2 // { old-time = overrideCabal stage2.old-time (drv: { postPatch = '' -- cgit 1.4.1