expose ghcVersions env packages in legacyPackages.ghc96 etc.

tek · Sep 16, 2023 · d3ac953 · d3ac953
1 parent 2735b54
commit d3ac953
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/output.nix b/lib/output.nix
@@ -19,10 +19,12 @@ let
     ghc = env.ghc;
   in withStatic ghc.ghc.${name} // { cross = cross ghc name; };
 
-  envDerivations = envs: let
-    envPkgs = v: let
-      env = config.envs.${v};
-    in mapAttrs' (n: d: { name = "${v}-${n}"; value = withCross env n; }) env.derivations;
+  envDerivations = v: let
+    env = config.envs.${v};
+  in mapAttrs (n: d: (withCross env n)) env.derivations;
+
+  prefixedEnvDerivations = envs: let
+    envPkgs = v: mapAttrs' (n: d: { name = "${v}-${n}"; value = d; }) (envDerivations v);
   in util.foldMapAttrs envPkgs envs;
 
   devOutputs = let
@@ -40,6 +42,8 @@ let
     static = staticDrv local.${config.main};
   };
 
+  scopedEnvDerivations = envs: genAttrs envs envDerivations;
+
 in {
-  inherit envDerivations devOutputs;
+  inherit prefixedEnvDerivations scopedEnvDerivations devOutputs;
 }
diff --git a/modules/output.nix b/modules/output.nix
@@ -126,13 +126,13 @@ in {
 
     outputs = {
 
-      packages = libOutput.devOutputs // libOutput.envDerivations config.ghcVersions;
+      packages = libOutput.devOutputs // libOutput.prefixedEnvDerivations config.ghcVersions;
 
       checks =
         config.envs.dev.derivations //
-        optionalAttrs config.compat.enable (libOutput.envDerivations config.compat.versions);
+        optionalAttrs config.compat.enable (libOutput.prefixedEnvDerivations config.compat.versions);
 
-      legacyPackages = {
+      legacyPackages = libOutput.scopedEnvDerivations config.ghcVersions // {
         inherit config;
         inherit (config.envs.dev.ghc) pkgs ghc;
         show-config = show-config.shell;