Suggestion: wire parts of the builder together in the same place

Author: rvl

builder/default.nix

@@ -6,6 +6,12 @@ let
     inherit ghc haskellLib makeConfigFiles ghcForComponent hsPkgs;
   };
 
+  setup-builder = haskellLib.weakCallPackage pkgs ./setup-builder.nix {
+    ghc = buildGHC;
+    hsPkgs = hsPkgs.buildPackages;
+    inherit haskellLib nonReinstallablePkgs makeConfigFiles;
+  };
+
   # Wraps GHC to provide dependencies in a way that works for both the
   # component builder and for nix-shells.
   ghcForComponent = import ./ghc-for-component-wrapper.nix {
@@ -31,7 +37,7 @@ in {
   # Build a Haskell package from its config.
   # TODO: this pkgs is the adjusted pkgs, but pkgs.pkgs is unadjusted
   build-package = haskellLib.weakCallPackage pkgs ./hspkg-builder.nix {
-    inherit haskellLib ghc buildGHC comp-builder nonReinstallablePkgs hsPkgs;
+    inherit haskellLib ghc buildGHC comp-builder setup-builder;
   };
 
   # Same as haskellPackages.shellFor in nixpkgs.

builder/hspkg-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, runCommand, pkgconfig, comp-builder, nonReinstallablePkgs, hsPkgs }:
+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, runCommand, comp-builder, setup-builder }:
 
 
 { flags
@@ -38,13 +38,9 @@ let
 
   setup = if package.buildType == "Simple"
     then defaultSetup
-    else haskellLib.weakCallPackage pkgs ./setup-builder.nix {
-      ghc = buildGHC;
+    else setup-builder {
       setup-depends = package.setup-depends;
-      hsPkgs = hsPkgs.buildPackages;
-      inherit haskellLib nonReinstallablePkgs
-              package name src flags pkgconfig
-              ;
+      inherit package name src flags;
     };
 
   buildComp = componentId: component: comp-builder {

builder/setup-builder.nix

@@ -1,16 +1,12 @@
-{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand
-, haskellLib, nonReinstallablePkgs, hsPkgs, setup-depends
-, package, name, src, flags }:
+{ stdenv, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeConfigFiles }:
+
+{ setup-depends, package, name, src, flags }:
 
 let
   fullName = "${name}-setup";
 
   includeGhcPackage = lib.any (p: p.identifier.name == "ghc") setup-depends;
 
-  makeConfigFiles = haskellLib.weakCallPackage buildPackages ./make-config-files.nix {
-    inherit ghc haskellLib nonReinstallablePkgs;
-  };
-
   configFiles = makeConfigFiles {
     inherit (package) identifier;
     inherit fullName flags;
@@ -22,31 +18,29 @@ let
     };
   }; 
 
-in stdenv.lib.fix (drv:
-
-stdenv.mkDerivation {
-  name = "${fullName}";
-  inherit src;
-  nativeBuildInputs = [ghc];
-
-  CABAL_CONFIG = configFiles + /cabal.config;
-  phases = ["unpackPhase" "buildPhase" "installPhase"];
-  buildPhase = ''
-    for f in Setup.hs Setup.lhs; do
-      if [ -f $f ]; then
-        echo Compiling package $f
-        ghc $f '' + (if includeGhcPackage then "-package ghc " else "")
-            + ''-package-db ${configFiles}/package.conf.d --make -o ./Setup
-        setup=$(pwd)/Setup
-      fi
-    done
-    [ -f ./Setup ] || (echo Failed to build Setup && exit 1)
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install ./Setup $out/bin/Setup
-  '';
-})
-
-
+in
+ stdenv.lib.fix (drv:
+    stdenv.mkDerivation {
+      name = "${fullName}";
+      inherit src;
+      nativeBuildInputs = [ghc];
+
+      CABAL_CONFIG = configFiles + /cabal.config;
+      phases = ["unpackPhase" "buildPhase" "installPhase"];
+      buildPhase = ''
+        for f in Setup.hs Setup.lhs; do
+          if [ -f $f ]; then
+            echo Compiling package $f
+            ghc $f '' + (if includeGhcPackage then "-package ghc " else "")
+                + ''-package-db ${configFiles}/package.conf.d --make -o ./Setup
+            setup=$(pwd)/Setup
+          fi
+        done
+        [ -f ./Setup ] || (echo Failed to build Setup && exit 1)
+      '';
+
+      installPhase = ''
+        mkdir -p $out/bin
+        install ./Setup $out/bin/Setup
+      '';
+    })