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

Add moduleLocation to mkFlake argument

Browse source 
tmp
This commit is contained in:
Yang, Bo 2023-05-09 09:41:01 -07:00
parent 006c75898c
commit 1e8a89e5f8
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extras/flakeModules.nix
View file

@ -1,4 +1,4 @@
{ config, self, lib, flake-parts-lib, ... }:
{ config, self, lib, flake-parts-lib, moduleLocation, ... }:
let
inherit (lib)
filterAttrs
@ -15,8 +15,8 @@ let
type = types.lazyAttrsOf types.deferredModule;
default = { };
apply = mapAttrs (k: v: {
_file = "${toString self.outPath}/flake.nix#flakeModules.${k}";
key = "${toString self.outPath}/flake.nix#flakeModules.${k}";
_file = "${toString moduleLocation}#flakeModules.${k}";
key = "${toString moduleLocation}#flakeModules.${k}";
imports = [ v ];
});
description = ''

11
lib.nix
View file

@ -98,6 +98,7 @@ let
${errorExample}
'')
, moduleLocation ? "${self.outPath}/flake.nix"
}:
throwIf
(!args?self && !args?inputs) ''
@ -117,7 +118,7 @@ let
(module:
lib.evalModules {
specialArgs = {
inherit self flake-parts-lib;
inherit self flake-parts-lib moduleLocation;
inputs = args.inputs or /* legacy, warned above */ self.inputs;
} // specialArgs;
modules = [ ./all-modules.nix module ];
@ -138,9 +139,11 @@ let
mkFlake = args: module:
let
loc =
if args?inputs.self.outPath
then args.inputs.self.outPath + "/flake.nix"
else "<mkFlake argument>";
args.moduleLocation or (
if args?inputs.self.outPath
then args.inputs.self.outPath + "/flake.nix"
else "<mkFlake argument>"
);
mod = lib.setDefaultModuleLocation loc module;
eval = flake-parts-lib.evalFlakeModule args mod;
in

4
modules/nixosModules.nix
View file

@ -1,4 +1,4 @@
{ config, self, lib, flake-parts-lib, ... }:
{ config, self, lib, flake-parts-lib, moduleLocation, ... }:
let
inherit (lib)
filterAttrs
@ -17,7 +17,7 @@ in
nixosModules = mkOption {
type = types.lazyAttrsOf types.unspecified;
default = { };
apply = mapAttrs (k: v: { _file = "${toString self.outPath}/flake.nix#nixosModules.${k}"; imports = [ v ]; });
apply = mapAttrs (k: v: { _file = "${toString moduleLocation}#nixosModules.${k}"; imports = [ v ]; });
description = ''
NixOS modules.