treewide(clanLib): rename all occurences of {clan-core,self}.lib to 'clanLib'
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
builtins.fromJSON (builtins.readFile ./clan_attrs.json)
|
||||
else
|
||||
{ };
|
||||
clan = clan-core.lib.buildClan {
|
||||
clan = clan-core.clanLib.buildClan {
|
||||
inherit self;
|
||||
meta.name = "test_flake_with_core";
|
||||
machines = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
outputs =
|
||||
{ self, clan-core }:
|
||||
let
|
||||
clan = clan-core.lib.buildClan {
|
||||
clan = clan-core.clanLib.buildClan {
|
||||
inherit self;
|
||||
meta.name = "test_flake_with_core_and_pass";
|
||||
machines = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
outputs =
|
||||
{ self, clan-core }:
|
||||
let
|
||||
clan = clan-core.lib.buildClan {
|
||||
clan = clan-core.clanLib.buildClan {
|
||||
inherit self;
|
||||
meta.name = "test_flake_with_core_dynamic_machines";
|
||||
machines =
|
||||
|
||||
@@ -86,8 +86,8 @@
|
||||
# only adding clanCoreWithVendoredDeps to the nix store is not enough
|
||||
templateDerivation = pkgs.closureInfo {
|
||||
rootPaths =
|
||||
builtins.attrValues (self.lib.select "clan.templates.clan.*.path" self)
|
||||
++ builtins.attrValues (self.lib.select "clan.templates.machine.*.path" self);
|
||||
builtins.attrValues (self.clanLib.select "clan.templates.clan.*.path" self)
|
||||
++ builtins.attrValues (self.clanLib.select "clan.templates.machine.*.path" self);
|
||||
|
||||
# FIXME: As the templates get modified in clanCoreWithVendoredDeps below, we need to add the modified version to the nix store too
|
||||
# However it is not possible (or I don't know how) to add a nix path from a built derivation to the nix store
|
||||
|
||||
Reference in New Issue
Block a user