fix(HACK): not broken anymore
This commit is contained in:
parent
99ef0b76de
commit
d63751578a
2 changed files with 12 additions and 2 deletions
8
hive.nix
8
hive.nix
|
@ -126,10 +126,11 @@ in
|
|||
};
|
||||
|
||||
netconf = {
|
||||
evalConfig = args: (import nixpkgs.nixos.unstable.path { }).lib.evalModules args;
|
||||
evalConfig =
|
||||
args: (import nixpkgs.nixos.unstable.path { }).lib.evalModules (builtins.trace args.modules args);
|
||||
|
||||
defaults =
|
||||
{ nodePath, ... }:
|
||||
{ nodeMeta, nodePath, ... }:
|
||||
{
|
||||
# Import the default modules
|
||||
imports = [
|
||||
|
@ -137,7 +138,10 @@ in
|
|||
./${nodePath}.nix
|
||||
./modules/netconf
|
||||
./lib/netconf-junos
|
||||
"${sources.nixpkgs}/nixos/modules/misc/assertions.nix"
|
||||
];
|
||||
|
||||
inherit (nodeMeta) deployment;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ let
|
|||
attrsOf
|
||||
bool
|
||||
str
|
||||
any
|
||||
submodule
|
||||
;
|
||||
|
||||
|
@ -30,6 +31,11 @@ in
|
|||
];
|
||||
|
||||
options = {
|
||||
# Hack because of this https://git.dgnum.eu/DGNum/colmena/src/commit/71b1b660f2cda2e34e134d0028cafbd56bb22008/src/nix/hive/eval.nix#L166 which defines nixpkgs option but we don't have it here. What about liminix ?
|
||||
nixpkgs = mkOption {
|
||||
type = attrsOf any;
|
||||
default = { };
|
||||
};
|
||||
netconf.xmls.configuration = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
|
|
Loading…
Reference in a new issue