Skip to content

Replace envFunc with shellFor; make name mandatory #30

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 7 commits into from
Oct 24, 2022
Merged

Replace envFunc with shellFor; make name mandatory #30

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
469130c
use shellFor, wip
srid Oct 24, 2022
98806fa
"
srid Oct 24, 2022
ad063a0
put in p
srid Oct 24, 2022
77c0688
fmt
srid Oct 24, 2022
1be1a04
modifier
srid Oct 24, 2022
ad5d731
simp
srid Oct 24, 2022
2d51271
cleanup
srid Oct 24, 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
16 changes: 12 additions & 4 deletions flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ in
name = mkOption {
type = types.str;
description = ''Name of the cabal package ("foo" if foo.cabal)'';
default = "";
};
root = mkOption {
type = types.path;
Expand All @@ -54,6 +53,7 @@ in
description = ''Overrides for the Cabal project'';
default = self: super: { };
};
# TODO: This option will go away after #7
modifier = mkOption {
type = functionTo types.package;
description = ''
Expand Down Expand Up @@ -159,9 +159,17 @@ in
hlint;
};
buildTools = lib.attrValues (defaultBuildTools hp // cfg.buildTools hp);
package = cfg.modifier (hp.callCabal2nixWithOptions cfg.name cfg.root "" { });
devShell = with pkgs.haskell.lib;
(addBuildTools package buildTools).envFunc { withHoogle = true; };
package' = hp.callCabal2nixWithOptions cfg.name cfg.root "" { };
package = cfg.modifier package';
devShell = (hp.extend (self: super: {
"${cfg.name}" = package';
})).shellFor {
packages = p: [
(cfg.modifier p."${cfg.name}")
];
withHoogle = true;
buildInputs = buildTools;
};
devShellCheck = name: command:
runCommandInSimulatedShell devShell cfg.root "${projectKey}-${name}-check" { } command;
in
Expand Down