From 114cd6765d9a1dc405af223294657b9e765a6f3d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 21 Feb 2016 10:15:04 -0800 Subject: haskell: Expose the package set used to build each GHC, where possible Tested to not change hashes --- pkgs/top-level/haskell-packages.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'pkgs/top-level/haskell-packages.nix') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2d0151dc5420..2eadcbeefef3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -34,24 +34,29 @@ rec { ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; }; - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix { - ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; + ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec { + bootPkgs = packages.ghc784; + inherit (bootPkgs) hscolour; }; - ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix { - ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; + ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec { + bootPkgs = packages.ghc784; + inherit (bootPkgs) hscolour; }; - ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix { - ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour; + ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec { + bootPkgs = packages.ghc7103; + inherit (bootPkgs) hscolour; }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - inherit (packages.ghc784) ghc alex happy; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { + bootPkgs = packages.ghc784; + inherit (bootPkgs) alex happy; }; - ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix { - inherit (packages.ghc784) ghc alex happy; + ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { + bootPkgs = packages.ghc784; + inherit (bootPkgs) alex happy; }; ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7103; + bootPkgs = packages.ghc7103; }; jhc = callPackage ../development/compilers/jhc { -- cgit 1.4.1