starred/nix-config-ryan4yin
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-25 09:28:27 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: rename colmena-meta to colmenaMeta

Browse Source
This commit is contained in:
Ryan Yin
2024-03-13 18:17:48 +08:00
parent bfdf86bf8d
commit a79a64beaf
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
outputs/aarch64-linux/default.nix
View File

@@ -18,9 +18,9 @@
nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths);
packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths);
# colmena contains some meta info, which need to be merged carefully. # colmena contains some meta info, which need to be merged carefully.
colmena-meta = { colmenaMeta = {
nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths);
nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths);
}; };
# colmena's per-machine data. # colmena's per-machine data.
colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths);

2
outputs/aarch64-linux/src/12kingdoms-rakushun.nix
View File

@@ -50,7 +50,7 @@
in { in {
nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs; nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs;
colmena-meta = { colmenaMeta = {
nodeSpecialArgs.${name} = rk3588SpecialArgs; nodeSpecialArgs.${name} = rk3588SpecialArgs;
nodeNixpkgs.${name} = rk3588Pkgs; nodeNixpkgs.${name} = rk3588Pkgs;
}; };

2
outputs/aarch64-linux/src/12kingdoms-suzu.nix
View File

@@ -50,7 +50,7 @@
in { in {
nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs; nixosConfigurations.${name} = mylib.nixosSystem rk3588SystemArgs;
colmena-meta = { colmenaMeta = {
nodeSpecialArgs.${name} = rk3588SpecialArgs; nodeSpecialArgs.${name} = rk3588SpecialArgs;
nodeNixpkgs.${name} = rk3588Pkgs; nodeNixpkgs.${name} = rk3588Pkgs;
}; };

4
outputs/default.nix
View File

@@ -74,8 +74,8 @@ in {
) )
// { // {
# per-node nixpkgs & specialArgs # per-node nixpkgs & specialArgs
nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) nixosSystemValues); nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) nixosSystemValues);
nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) nixosSystemValues); nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) nixosSystemValues);
}; };
} }
// lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) nixosSystemValues); // lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) nixosSystemValues);

6
outputs/riscv64-linux/default.nix
View File

@@ -18,9 +18,9 @@
nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths);
packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths);
# colmena contains some meta info, which need to be merged carefully. # colmena contains some meta info, which need to be merged carefully.
colmena-meta = { colmenaMeta = {
nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths);
nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths);
}; };
# colmena's per-machine data. # colmena's per-machine data.
colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths);

2
outputs/riscv64-linux/src/rolling-girls-nozomi.nix
View File

@@ -50,7 +50,7 @@
in { in {
nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs; nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs;
colmena-meta = { colmenaMeta = {
nodeSpecialArgs.${name} = lpi4aSpecialArgs; nodeSpecialArgs.${name} = lpi4aSpecialArgs;
nodeNixpkgs.${name} = lpi4aPkgs; nodeNixpkgs.${name} = lpi4aPkgs;
}; };

2
outputs/riscv64-linux/src/rolling-girls-yukina.nix
View File

@@ -50,7 +50,7 @@
in { in {
nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs; nixosConfigurations.${name} = mylib.nixosSystem lpi4aSystemArgs;
colmena-meta = { colmenaMeta = {
nodeSpecialArgs.${name} = lpi4aSpecialArgs; nodeSpecialArgs.${name} = lpi4aSpecialArgs;
nodeNixpkgs.${name} = lpi4aPkgs; nodeNixpkgs.${name} = lpi4aPkgs;
}; };

6
outputs/x86_64-linux/default.nix
View File

@@ -18,9 +18,9 @@
nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths); nixosConfigurations = lib.attrsets.mergeAttrsList (map (it: it.nixosConfigurations or {}) dataWithoutPaths);
packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths); packages = lib.attrsets.mergeAttrsList (map (it: it.packages or {}) dataWithoutPaths);
# colmena contains some meta info, which need to be merged carefully. # colmena contains some meta info, which need to be merged carefully.
colmena-meta = { colmenaMeta = {
nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeNixpkgs or {}) dataWithoutPaths); nodeNixpkgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeNixpkgs or {}) dataWithoutPaths);
nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmena-meta.nodeSpecialArgs or {}) dataWithoutPaths); nodeSpecialArgs = lib.attrsets.mergeAttrsList (map (it: it.colmenaMeta.nodeSpecialArgs or {}) dataWithoutPaths);
}; };
colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths); colmena = lib.attrsets.mergeAttrsList (map (it: it.colmena or {}) dataWithoutPaths);
}; };