Skip to content
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

Respect defaults in shellFor (fixes #2306) #2322

Merged
merged 2 commits into from
Feb 18, 2025
Merged

Respect defaults in shellFor (fixes #2306) #2322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fec0f0
Respect defaults in `shellFor` (fixes #2306)
hamishmack Feb 18, 2025
73a8a90
Fix use of `hackage` in `mkStackPkgSet`
hamishmack Feb 18, 2025
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
6 changes: 3 additions & 3 deletions overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ final: prev: {
You may need to update haskell.nix to one that includes a newer stackage.nix.
'');
# The compiler referenced in the stack config
compiler = (stack-pkgs.extras hackage).compiler or (pkg-def hackage).compiler;
compiler = (stack-pkgs.extras hackageForStack).compiler or (pkg-def hackageForStack).compiler;
patchesModule = ghcHackagePatches.${compiler.nix-name} or {};
# Remove fake packages generated from stack keywords used in ghc-options
removeStackSpecial = module: if builtins.typeOf module == "set"
Expand Down Expand Up @@ -823,7 +823,7 @@ final: prev: {
shellFor = shellArgs:
let
# These are the args we will pass to the main shell.
args' = builtins.removeAttrs shellArgs [ "crossPlatforms" ];
args' = builtins.removeAttrs (rawProject.args.shell // shellArgs) [ "crossPlatforms" ];
# These are the args we will pass to the shells for the corss compiler
argsCross =
# These things should match main shell
Expand All @@ -847,7 +847,7 @@ final: prev: {
});

# Default shell
shell = shellFor rawProject.args.shell;
shell = shellFor {};

# Like `.hsPkgs.${packageName}` but when compined with `getComponent` any
# cabal configure errors are defered until the components derivation builds.
Expand Down