Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

builder/comp-builder.nix

@@ -55,6 +55,15 @@ let self =
 , doHoogle ? component.doHoogle # Also build a hoogle index
 , hyperlinkSource ? component.doHyperlinkSource # Link documentation to the source code
 , quickjump ? component.doQuickjump # Generate an index for interactive documentation navigation
+
+# Keep the configFiles as a derivation output (otherwise they are in a temp directory)
+# We need this for `cabal-doctest` to work, but it is also likely
+, keepConfigFiles ? component.keepConfigFiles || configureAllComponents
+
+# Keep the ghc wrapper as a `ghc` derivation output (otherwise it is in a temp directory)
+# This is used for the `ghc-paths` package in `modules/configuration.nix`
+, keepGhc ? component.keepGhc
+
 , keepSource ? component.keepSource || configureAllComponents # Build from `source` output in the store then delete `dist`
 , setupHaddockFlags ? component.setupHaddockFlags
 
@@ -397,7 +406,9 @@ let
       [ghc buildPackages.removeReferencesTo]
       ++ executableToolDepends;
 
-    outputs = ["out" "configFiles" "ghc"]
+    outputs = ["out"]
+      ++ (lib.optional keepConfigFiles "configFiles")
+      ++ (lib.optional keepGhc "ghc")
       ++ (lib.optional enableSeparateDataOutput "data")
       ++ (lib.optional keepSource "source")
       ++ (lib.optional writeHieFiles "hie");
@@ -416,9 +427,22 @@ let
         chmod -R +w .
       '') + commonAttrs.prePatch;
 
-    configurePhase = ''
-      mkdir -p $configFiles
-      mkdir -p $ghc
+    configurePhase =
+      (
+        if keepConfigFiles then ''
+          mkdir -p $configFiles
+        ''
+        else ''
+          configFiles=$(mktemp -d)
+        ''
+      ) + (
+        if keepGhc then ''
+          mkdir -p $ghc
+        ''
+        else ''
+          ghc=$(mktemp -d)
+        ''
+      ) + ''
       wrappedGhc=$ghc
       ${configFiles.script}
       ${shellWrappers.script}

flake.lock

@@ -157,4 +157,8 @@ in {
   packages.bitvec.patches = [
     (fromUntil "1.1.3.0" "1.1.3.0.1" ../patches/bitvec-gmp-fix.patch)
   ];
+
+  # ghc-paths stores the path of the GHC compiler used to build the component.
+  # we need to keep it in the store so that it will remain valid.
+  packages.ghc-paths.components.library.keepGhc = true;
 }

modules/configuration-nix.nix

@@ -355,11 +355,13 @@ in {
         # Exclude attributes that are likely to have conflicting definitions
         # (a common use case for `all` is in `shellFor` and it only has an
         # install phase).
-        builtins.removeAttrs c ["preCheck" "postCheck" "keepSource"]
+        builtins.removeAttrs c ["preCheck" "postCheck" "keepConfigFiles" "keepGhc" "keepSource"]
       ) (lib.filter (c: c.buildable && c.planned) allComps)
     ) // {
-      # If any one of the components needs us to keep the source
+      # If any one of the components needs us to keep one of these
       # then keep it for the `all` component
+      keepConfigFiles = lib.foldl' (x: comp: x || comp.keepConfigFiles) false allComps;
+      keepGhc = lib.foldl' (x: comp: x || comp.keepGhc) false allComps;
       keepSource = lib.foldl' (x: comp: x || comp.keepSource) false allComps;
     };
 }

modules/package.nix

@@ -168,6 +168,18 @@ let
       default = (def.profilingDetail or "default");
     };
 
+    keepConfigFiles = mkOption {
+      type = bool;
+      default = (def.keepConfigFiles or false);
+      description = "Keep component configFiles in the store in a `configFiles` output";
+    };
+
+    keepGhc = mkOption {
+      type = bool;
+      default = (def.keepGhc or false);
+      description = "Keep component wrapped ghc in the store in a `ghc` output";
+    };
+
     keepSource = mkOption {
       type = bool;
       default = (def.keepSource or false);