forked from DGNum/infrastructure
fix(compute01/extranix): Make it build
This commit is contained in:
parent
3dd314e78c
commit
0235b77777
1 changed files with 6 additions and 10 deletions
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
|
meta,
|
||||||
sources,
|
sources,
|
||||||
dgn-keys,
|
dgn-keys,
|
||||||
...
|
...
|
||||||
|
@ -38,7 +39,7 @@ in
|
||||||
"DGNum Infrastructure" =
|
"DGNum Infrastructure" =
|
||||||
let
|
let
|
||||||
# prefer a non-patched nixpkgs
|
# prefer a non-patched nixpkgs
|
||||||
infra-nixpkgs = (import "${hive-root}/hive.nix").meta.nixpkgs { };
|
infra-nixpkgs = (import "${hive-root}/bootstrap.nix").pkgs;
|
||||||
infra-modulesPath = "${infra-nixpkgs.path}/nixos/modules/";
|
infra-modulesPath = "${infra-nixpkgs.path}/nixos/modules/";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -46,7 +47,7 @@ in
|
||||||
"modules/generic"
|
"modules/generic"
|
||||||
"modules/nixos"
|
"modules/nixos"
|
||||||
];
|
];
|
||||||
ignored-modules = import "${infra-modulesPath}/module-list.nix" ++ [
|
ignored-modules = (import "${infra-modulesPath}/module-list.nix") ++ [
|
||||||
"${sources.agenix}/modules/age.nix"
|
"${sources.agenix}/modules/age.nix"
|
||||||
"${sources.arkheon}/module.nix"
|
"${sources.arkheon}/module.nix"
|
||||||
"${sources."microvm.nix"}/nixos-modules/host"
|
"${sources."microvm.nix"}/nixos-modules/host"
|
||||||
|
@ -54,21 +55,16 @@ in
|
||||||
{ system.stateVersion = "25.05"; }
|
{ system.stateVersion = "25.05"; }
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit sources;
|
inherit meta sources;
|
||||||
lib = infra-nixpkgs.lib // {
|
modulesPath = builtins.storePath infra-modulesPath;
|
||||||
inherit (lib) extra;
|
|
||||||
};
|
|
||||||
modulesPath = infra-modulesPath;
|
|
||||||
pkgs = infra-nixpkgs;
|
pkgs = infra-nixpkgs;
|
||||||
|
inherit (infra-nixpkgs) lib;
|
||||||
name = "nodeName";
|
name = "nodeName";
|
||||||
nodeMeta = {
|
nodeMeta = {
|
||||||
nix-modules = [ ];
|
nix-modules = [ ];
|
||||||
admins = [ ];
|
admins = [ ];
|
||||||
adminGroups = [ ];
|
adminGroups = [ ];
|
||||||
};
|
};
|
||||||
meta = {
|
|
||||||
organization.groups.root = [ ];
|
|
||||||
};
|
|
||||||
dgn-keys = dgn-keys // {
|
dgn-keys = dgn-keys // {
|
||||||
getNodeAdmins = _: [ ];
|
getNodeAdmins = _: [ ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue