yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'treewide(clanLib): rename all occurences of {clan-core,self}.lib to 'clanLib'' (#3263) from hsjobeki/clan-core:lib-cleanup into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3263
This commit is contained in:
hsjobeki
2025-04-09 15:10:42 +00:00
parent 1d346046dc a6a79e83a0
commit 11d88e51ab
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/tests/test_flake_with_core/flake.nix
View File

@@ -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 = {

2
pkgs/clan-cli/clan_cli/tests/test_flake_with_core_and_pass/flake.nix
View File

@@ -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 = {

2
pkgs/clan-cli/clan_cli/tests/test_flake_with_core_dynamic_machines/flake.nix
View File

@@ -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 =

4
pkgs/clan-cli/flake-module.nix
View File

@@ -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