buildFromSdist: enable only for local packages (#298)

This commit is contained in:
Sridhar Ratnakumar 2024-04-03 03:30:17 -04:00 committed by GitHub
parent b1db0d5312
commit d9dbdd466a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 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) - #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)
- Enhancements - Enhancements
- `settings` module: - `settings` module:
- #210: Add `extraLibraries` to `settings` module. - #210: Add `extraLibraries` to `settings` module.

View File

@ -84,21 +84,18 @@ in
''; '';
default = default =
let let
globalSettings = {
# Make sure all files we use are included in the sdist, as a check
# for release-worthiness.
buildFromSdist = lib.mkDefault true;
};
localSettings = { name, package, config, ... }: localSettings = { name, package, config, ... }:
lib.optionalAttrs (package.local.toDefinedProject or false) { lib.optionalAttrs (package.local.toDefinedProject or false) {
# 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.
# Make sure all files we use are included in the sdist, as a check
# for release-worthiness.
buildFromSdist = lib.mkDefault true;
}; };
in in
if config.defaults.enable then { if config.defaults.enable then {
imports = [ imports = [
globalSettings
localSettings localSettings
]; ];
} else { }; } else { };