diff --git a/outputs/aarch64-linux/default.nix b/outputs/aarch64-linux/default.nix index 9288d828..7653b4c3 100644 --- a/outputs/aarch64-linux/default.nix +++ b/outputs/aarch64-linux/default.nix @@ -18,9 +18,9 @@ nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); # colmena contains some meta info, which need to be merged carefully. - colmena-meta = { - nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); - nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); + colmenaMeta = { + nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths); + nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths); }; # colmena's per-machine data. colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); diff --git a/outputs/aarch64-linux/src/12kingdoms-rakushun.nix b/outputs/aarch64-linux/src/12kingdoms-rakushun.nix index dfc34fce..d5ff1657 100644 --- a/outputs/aarch64-linux/src/12kingdoms-rakushun.nix +++ b/outputs/aarch64-linux/src/12kingdoms-rakushun.nix @@ -50,7 +50,7 @@ in { nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs; - colmena-meta = { + colmenaMeta = { nodeSpecialArgs.${name} = rk3588SpecialArgs; nodeNixpkgs.${name} = rk3588Pkgs; }; diff --git a/outputs/aarch64-linux/src/12kingdoms-suzu.nix b/outputs/aarch64-linux/src/12kingdoms-suzu.nix index dec5a75b..2c1c2658 100644 --- a/outputs/aarch64-linux/src/12kingdoms-suzu.nix +++ b/outputs/aarch64-linux/src/12kingdoms-suzu.nix @@ -50,7 +50,7 @@ in { nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs; - colmena-meta = { + colmenaMeta = { nodeSpecialArgs.${name} = rk3588SpecialArgs; nodeNixpkgs.${name} = rk3588Pkgs; }; diff --git a/outputs/default.nix b/outputs/default.nix index 89e1f5ad..ef2e1248 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -74,8 +74,8 @@ in { ) // { # per-node nixpkgs & specialArgs - nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) nixosSystemValues); - nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) nixosSystemValues); + nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) nixosSystemValues); + nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) nixosSystemValues); }; } // lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) nixosSystemValues); diff --git a/outputs/riscv64-linux/default.nix b/outputs/riscv64-linux/default.nix index 9288d828..7653b4c3 100644 --- a/outputs/riscv64-linux/default.nix +++ b/outputs/riscv64-linux/default.nix @@ -18,9 +18,9 @@ nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); # colmena contains some meta info, which need to be merged carefully. - colmena-meta = { - nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); - nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); + colmenaMeta = { + nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths); + nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths); }; # colmena's per-machine data. colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); diff --git a/outputs/riscv64-linux/src/rolling-girls-nozomi.nix b/outputs/riscv64-linux/src/rolling-girls-nozomi.nix index 546574c6..80152720 100644 --- a/outputs/riscv64-linux/src/rolling-girls-nozomi.nix +++ b/outputs/riscv64-linux/src/rolling-girls-nozomi.nix @@ -50,7 +50,7 @@ in { nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs; - colmena-meta = { + colmenaMeta = { nodeSpecialArgs.${name} = lpi4aSpecialArgs; nodeNixpkgs.${name} = lpi4aPkgs; }; diff --git a/outputs/riscv64-linux/src/rolling-girls-yukina.nix b/outputs/riscv64-linux/src/rolling-girls-yukina.nix index cb84bda2..a54fbaa2 100644 --- a/outputs/riscv64-linux/src/rolling-girls-yukina.nix +++ b/outputs/riscv64-linux/src/rolling-girls-yukina.nix @@ -50,7 +50,7 @@ in { nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs; - colmena-meta = { + colmenaMeta = { nodeSpecialArgs.${name} = lpi4aSpecialArgs; nodeNixpkgs.${name} = lpi4aPkgs; }; diff --git a/outputs/x86_64-linux/default.nix b/outputs/x86_64-linux/default.nix index 04cab8b6..a5c56b14 100644 --- a/outputs/x86_64-linux/default.nix +++ b/outputs/x86_64-linux/default.nix @@ -18,9 +18,9 @@ nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); # colmena contains some meta info, which need to be merged carefully. - colmena-meta = { - nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); - nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); + colmenaMeta = { + nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths); + nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths); }; colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); };