Compare commits

...

1 Commits

Author SHA1 Message Date
Johannes Kirschbauer
7c8de49258 buildClan: remove in favor of lib.clan 2025-07-21 20:29:26 +02:00
4 changed files with 4 additions and 30 deletions

View File

@@ -11,7 +11,7 @@
... ...
}: }:
let let
buildClanOptions = self'.legacyPackages.clan-internals-docs; clanOptions = self'.legacyPackages.clan-internals-docs;
# Simply evaluated options (JSON) # Simply evaluated options (JSON)
# { clanCore = «derivation JSON»; clanModules = { ${name} = «derivation JSON» }; } # { clanCore = «derivation JSON»; clanModules = { ${name} = «derivation JSON» }; }
jsonDocs = pkgs.callPackage ./get-module-docs.nix { jsonDocs = pkgs.callPackage ./get-module-docs.nix {
@@ -99,7 +99,7 @@
# Frontmatter format for clanModules # Frontmatter format for clanModules
export CLAN_MODULES_FRONTMATTER_DOCS=${clanModulesFrontmatter}/share/doc/nixos/options.json export CLAN_MODULES_FRONTMATTER_DOCS=${clanModulesFrontmatter}/share/doc/nixos/options.json
export BUILD_CLAN_PATH=${buildClanOptions}/share/doc/nixos/options.json export BUILD_CLAN_PATH=${clanOptions}/share/doc/nixos/options.json
mkdir $out mkdir $out

View File

@@ -21,7 +21,6 @@ lib.fix (
{ {
inherit (buildClanLib) inherit (buildClanLib)
buildClan
clan clan
; ;
/** /**

View File

@@ -5,32 +5,7 @@
clan-core, clan-core,
... ...
}: }:
rec { {
buildClan =
module:
lib.warn ''
==================== DEPRECATION NOTICE ====================
Please migrate
from: 'clan = inputs.<clan-core>.lib.buildClan'
to : 'clan = inputs.<clan-core>.lib.clan'
in your flake.nix.
Please also migrate
from: 'inherit (clan) nixosConfigurations clanInternals; '
to : "
inherit (clan.config) nixosConfigurations clanInternals;
clan = clan.config;
"
in your flake.nix.
Reason:
- Improves consistency between flake-parts and non-flake-parts users.
- It also allows us to use the top level attribute 'clan' to expose
attributes that can be used for cross-clan functionality.
============================================================
'' (clan module).config;
clan = clan =
{ {
self ? lib.warn "Argument: 'self' must be set" null, # Reference to the current flake self ? lib.warn "Argument: 'self' must be set" null, # Reference to the current flake

View File

@@ -139,7 +139,7 @@ class InventoryStore:
def _load_merged_inventory(self) -> InventorySnapshot: def _load_merged_inventory(self) -> InventorySnapshot:
""" """
Loads the evaluated inventory. Loads the evaluated inventory.
After all merge operations with eventual nix code in buildClan. After all merge operations with eventual nix code in lib.clan.
Evaluates clanInternals.inventoryClass.inventory with nix. Which is performant. Evaluates clanInternals.inventoryClass.inventory with nix. Which is performant.