1
0
Fork 0
mirror of https://github.com/hercules-ci/flake-parts.git synced 2024-12-14 11:47:31 +00:00

Merge pull request #194 from hercules-ci/error-location

Fix default error location
This commit is contained in:
Robert Hensing 2023-10-29 12:33:47 +01:00 committed by GitHub
commit f76e870d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -84,7 +84,6 @@ let
, moduleLocation ? "${self.outPath}/flake.nix" , moduleLocation ? "${self.outPath}/flake.nix"
}: }:
let let
module = lib.setDefaultModuleLocation errorLocation module;
inputsPos = builtins.unsafeGetAttrPos "inputs" args; inputsPos = builtins.unsafeGetAttrPos "inputs" args;
errorLocation = errorLocation =
# Best case: user makes it explicit # Best case: user makes it explicit
@ -120,7 +119,7 @@ let
inherit self flake-parts-lib moduleLocation; inherit self flake-parts-lib moduleLocation;
inputs = args.inputs or /* legacy, warned above */ self.inputs; inputs = args.inputs or /* legacy, warned above */ self.inputs;
} // specialArgs; } // specialArgs;
modules = [ ./all-modules.nix module ]; modules = [ ./all-modules.nix (lib.setDefaultModuleLocation errorLocation module) ];
} }
); );