Skip to content

Allow merging cabalProject{,Local,Freeze} #1638

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 3 commits into from
Sep 7, 2022
Merged

Allow merging cabalProject{,Local,Freeze} #1638

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab59b8d
Allow merging cabalProject{,Local,Freeze}
L-as Sep 1, 2022
fe82685
Specify types of `sha256map` and `configureArgs`
L-as Sep 1, 2022
2126269
Fix type of `sha256map`
L-as Sep 6, 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
10 changes: 5 additions & 5 deletions modules/cabal-project.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ in {
default = "cabal.project";
};
cabalProject = mkOption {
type = nullOr str;
type = nullOr lines;
default = readIfExists config.src config.cabalProjectFileName;
};
cabalProjectLocal = mkOption {
type = nullOr str;
type = nullOr lines;
default = readIfExists config.src "${config.cabalProjectFileName}.local";
};
cabalProjectFreeze = mkOption {
type = nullOr str;
type = nullOr lines;
default = readIfExists config.src "${config.cabalProjectFileName}.freeze";
};
ghc = mkOption {
Expand All @@ -79,7 +79,7 @@ in {
description = "cabal-install to use when running `cabal configure`";
};
configureArgs = mkOption {
type = nullOr str;
type = nullOr (separatedString " ");
default = "";
description = ''
Extra arguments to pass to `cabal v2-configure`.
Expand All @@ -90,7 +90,7 @@ in {
'';
};
sha256map = mkOption {
type = nullOr unspecified;
type = nullOr (attrsOf (attrsOf str));
default = null;
description = ''
An alternative to adding `--sha256` comments into the
Expand Down