From e20cdd30ad9201bedc4977fa55f7a4765d6a56ac Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 3 Apr 2024 17:29:02 +1100 Subject: [PATCH 1/2] buildFromSdist: enable only for local packages --- nix/modules/project/defaults.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nix/modules/project/defaults.nix b/nix/modules/project/defaults.nix index b5c71428..a5fe1a0f 100644 --- a/nix/modules/project/defaults.nix +++ b/nix/modules/project/defaults.nix @@ -84,21 +84,18 @@ in ''; default = 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, ... }: lib.optionalAttrs (package.local.toDefinedProject or false) { # 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. 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 if config.defaults.enable then { imports = [ - globalSettings localSettings ]; } else { }; From 0520f511e1ea94adf01d48beebeb730cb65f4e64 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 3 Apr 2024 18:29:59 +1100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90761b7e..6e95e016 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - 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) - - #253: Enable controlling `buildFromSdist` through `settings..buildFromSdist`. (This was turned off by default originally, but was turned on by default in #286) + - #253: Enable controlling `buildFromSdist` through `settings..buildFromSdist`. (This was turned off by default originally, but was turned on by default in #286, limited to local packages in #298) - Enhancements - `settings` module: - #210: Add `extraLibraries` to `settings` module.