Use nix-tools static cabal act-as-setup for default setup

Author: hamishmack

builder/comp-builder.nix

@@ -285,7 +285,7 @@ let
 
       enableParallelBuilding = true;
 
-      SETUP_HS = setup + /bin/Setup;
+      SETUP_HS = setup;
 
       inherit cabalFile;
       passAsFile = [ "cabalFile" ];

builder/hspkg-builder.nix

@@ -35,10 +35,7 @@ let
 
   setup = if package.buildType == "Simple"
     then
-      # Don't try to build default setup with DWARF enabled
-      let defaultSetup = ghc.defaultSetupFor package.identifier.name // {
-        dwarf = defaultSetup;
-      }; in defaultSetup
+      buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal + "/bin/cabal act-as-setup --build-type=Simple --"
     else setup-builder ({
       component = components.setup // {
         depends = config.setup-depends ++ components.setup.depends ++ package.setup-depends;
@@ -49,7 +46,7 @@ let
       inherit (pkg) preUnpack postUnpack prePatch postPatch;
     } // lib.optionalAttrs (package.buildType != "Custom") {
       nonReinstallablePkgs = ["base" "Cabal"];
-    });
+    }) + "/bin/setup";
 
   buildComp = allComponent: componentId: component: comp-builder {
     inherit allComponent componentId component package name src flags setup cabalFile cabal-generator patches

overlays/default-setup.nix

@@ -85,7 +85,6 @@ let
     ghcjs = import ./ghcjs.nix;
     cabalPkgConfig = import ./cabal-pkg-config.nix;
     cacheCompilerDeps = import ./cache-compiler-deps.nix;
-    default-setup = import ./default-setup.nix;
     dummy-ghc-data = import ./dummy-ghc-data.nix;
     fetch-source = import ./fetch-source.nix;
   };

overlays/default.nix

@@ -1121,10 +1121,6 @@ final: prev: {
             # Things that require two levels of IFD to build (inputs should be in level 1)
             nix-tools = final.buildPackages.haskell-nix.nix-tools;
             nix-tools-unchecked = final.buildPackages.haskell-nix.nix-tools-unchecked;
-            # This is the setup using the prefered Cabal library.
-            default-setup = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.defaultSetupFor "some-package";
-            # This is the one used when that one is not allowed.
-            setup-cabal-from-ghc = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.defaultSetup.useCabalFromGHC;
           } // final.lib.optionalAttrs (ifdLevel > 1
             && final.haskell-nix.haskellLib.isCrossHost
             # GHCJS builds its own template haskell runner.