mirrors/flake-parts
mirrors/flake-parts
1
0
Fork 0
mirror of https://github.com/hercules-ci/flake-parts.git synced 2025-03-15 21:08:26 +00:00
Code Activity

Merge pull request #99 from hercules-ci/easyOverlay-remove-warning

Browse source 
easyOverlay: Remove performance warning which is not relevant
This commit is contained in:
Robert Hensing 2023-01-05 01:09:49 +01:00 • committed by GitHub
commit 0944986217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extras/easyOverlay.nix
View file

@ -1,4 +1,4 @@
toplevel@{ config, lib, flake-parts-lib, getSystem, ... }: toplevel@{ config, lib, flake-parts-lib, getSystemIgnoreWarning, ... }:
let let
inherit (flake-parts-lib) inherit (flake-parts-lib)
mkPerSystemOption; mkPerSystemOption;
@ -50,7 +50,7 @@ in
throw "Could not determine the `hostPlatform` of Nixpkgs. Was this overlay loaded as a Nixpkgs overlay, or was it loaded into something else?" throw "Could not determine the `hostPlatform` of Nixpkgs. Was this overlay loaded as a Nixpkgs overlay, or was it loaded into something else?"
) )
); );
perSys = (getSystem system).extendModules { perSys = (getSystemIgnoreWarning system).extendModules {
modules = [ modules = [
{ {
_file = "flake-parts#flakeModules.easyOverlay/overlay-overrides"; _file = "flake-parts#flakeModules.easyOverlay/overlay-overrides";

6
modules/perSystem.nix
View file

@ -110,6 +110,12 @@ in
allSystems = genAttrs config.systems config.perSystem; allSystems = genAttrs config.systems config.perSystem;
# TODO: Sub-optimal error message. Get Nix to support a memoization primop, or get Nix Flakes to support systems properly or get Nix Flakes to add a name to flakes. # TODO: Sub-optimal error message. Get Nix to support a memoization primop, or get Nix Flakes to support systems properly or get Nix Flakes to add a name to flakes.
_module.args.getSystem = system: config.allSystems.${system} or (builtins.trace "using non-memoized system ${system}" config.perSystem system); _module.args.getSystem = system: config.allSystems.${system} or (builtins.trace "using non-memoized system ${system}" config.perSystem system);
# The warning is there for a reason. Only use this in situations where the
# performance cost has already been incurred, such as in `flakeModules.easyOverlay`,
# where we run in the context of an overlay, and the performance cost of the
# extra `pkgs` makes the cost of running `perSystem` probably negligible.
_module.args.getSystemIgnoreWarning = system: config.allSystems.${system} or config.perSystem system;
}; };
} }