fix: buildFromSdist default for haskell-flake managed packages only

This commit is contained in:
Sridhar Ratnakumar 2024-04-22 17:48:01 +10:00 committed by Sridhar Ratnakumar
parent e43bc631b4
commit a85328353a
2 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@
- Breaking changes - Breaking changes
- #221: Switch from `buildFromCabalSdist` to `buildFromSdist`, to allow using non-standard package sets (wherein `cabal-install` is otherwise built without using user's overrides) - #221: Switch from `buildFromCabalSdist` to `buildFromSdist`, to allow using non-standard package sets (wherein `cabal-install` is otherwise built without using user's overrides)
- #253: Enable controlling `buildFromSdist` through `settings.<name>.buildFromSdist`. (This was turned off by default originally, but was turned on by default in #286, limited to local packages in #298) - #253: Enable controlling `buildFromSdist` through `settings.<name>.buildFromSdist`. (This was turned off by default originally, but was turned on by default in #286, limited to packages defined by haskell-flake in #298 & #306)
- Enhancements - Enhancements
- `settings` module: - `settings` module:
- #210: Add `extraLibraries` to `settings` module. - #210: Add `extraLibraries` to `settings` module.

View File

@ -131,7 +131,8 @@ in
else { }; else { };
defaultText = '' defaultText = ''
Speed up builds by disabling haddock and library profiling. Speed up builds by disabling haddock and library profiling. Also ensures
release-worthiness.
This uses `local.toDefinedProject` option to determine which packages to This uses `local.toDefinedProject` option to determine which packages to
override. Thus, it applies to both local packages as well as override. Thus, it applies to both local packages as well as
@ -144,6 +145,7 @@ in
# Disabling haddock and profiling is mainly to speed up Nix builds. # Disabling haddock and profiling is mainly to speed up Nix builds.
haddock = lib.mkDefault false; # Because, this is end-user software. No need for library docs. haddock = lib.mkDefault false; # Because, this is end-user software. No need for library docs.
libraryProfiling = lib.mkDefault false; # Avoid double-compilation. libraryProfiling = lib.mkDefault false; # Avoid double-compilation.
buildFromSdist = lib.mkDefault true; # Ensure release-worthiness
}; };
}; };
@ -191,11 +193,9 @@ in
} }
else { }; else { };
defaultText = '' defaultText = ''
Make sure all files we use are included in the sdist, as a check for release-worthiness. Nothing is changed by default.
''; '';
default = { default = { };
buildFromSdist = lib.mkDefault true;
};
}; };
projectModules.output = mkOption { projectModules.output = mkOption {