Skip to content

Add support for .env shells to flake.nix #3322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Add support for .env shells to flake.nix #3322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3feaa5
Add support for `.env` shells to `flake.nix`
Gabriella439 Nov 7, 2022
f42f580
Merge branch 'master' into gabriella/envShells
Gabriella439 Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@

src = null;
};

mkEnvShell = hpkgs:
pkgs.lib.mapAttrs (name: value: hpkgs.${name}.env) pkgs.hlsSources;

# Create a hls executable
# Copied from https://github.com/NixOS/nixpkgs/blob/210784b7c8f3d926b7db73bdad085f4dc5d79428/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix#L16
mkExe = hpkgs:
Expand Down Expand Up @@ -388,14 +392,23 @@
haskell-language-server-942-dev-nix = mkDevShellWithNixDeps ghc942 "cabal.project";
};

# The default shell provided by Nixpkgs for a Haskell package (i.e. the
# one that comes in the `.env` attribute)
envShells = {
haskell-language-server-dev-env = mkEnvShell ghcDefault;
haskell-language-server-902-dev-env = mkEnvShell ghc902;
haskell-language-server-924-dev-env = mkEnvShell ghc924;
haskell-language-server-942-dev-env = mkEnvShell ghc942;
};

allPackages = {
haskell-language-server = mkExe ghcDefault;
haskell-language-server-902 = mkExe ghc902;
haskell-language-server-924 = mkExe ghc924;
haskell-language-server-942 = mkExe ghc942;
};

devShells = simpleDevShells // nixDevShells // {
devShells = simpleDevShells // nixDevShells // envShells // {
default = simpleDevShells.haskell-language-server-dev;
};

Expand Down