From 725e097f01fa6c808323134ab4ecdd5f33954f51 Mon Sep 17 00:00:00 2001 From: Torsten Schmits Date: Sat, 16 Sep 2023 22:06:22 +0200 Subject: [PATCH] expose env ghc and pkgs at legacyPackages.env.* --- lib/output.nix | 4 +++- modules/output.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/output.nix b/lib/output.nix index 60b81b3..2977430 100644 --- a/lib/output.nix +++ b/lib/output.nix @@ -44,6 +44,8 @@ let scopedEnvDerivations = envs: genAttrs envs envDerivations; + envsApi = envs: { env = mapAttrs (n: e: { inherit (e.ghc) pkgs ghc; } // envDerivations n) envs; }; + in { - inherit prefixedEnvDerivations scopedEnvDerivations devOutputs; + inherit prefixedEnvDerivations scopedEnvDerivations devOutputs envsApi; } diff --git a/modules/output.nix b/modules/output.nix index 3076bd8..16889e2 100644 --- a/modules/output.nix +++ b/modules/output.nix @@ -132,7 +132,7 @@ in { config.envs.dev.derivations // optionalAttrs config.compat.enable (libOutput.prefixedEnvDerivations config.compat.versions); - legacyPackages = libOutput.scopedEnvDerivations config.ghcVersions // { + legacyPackages = libOutput.scopedEnvDerivations config.ghcVersions // libOutput.envsApi config.envs // { inherit config; inherit (config.envs.dev.ghc) pkgs ghc; show-config = show-config.shell;