Merge pull request 'modules: move clan docs into clan-module' (#5651) from lib-modules into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5651
This commit is contained in:
hsjobeki
2025-10-23 15:57:38 +00:00
3 changed files with 27 additions and 23 deletions

View File

@@ -1,19 +1,20 @@
{
pkgs,
lib,
clan-core,
clanModule,
clanLib,
}:
let
eval = lib.evalModules {
modules = [
clan-core.modules.clan.default
clanModule
];
};
evalDocs = pkgs.nixosOptionsDoc {
options = eval.options;
warningsAreErrors = false;
transformOptions = clan-core.clanLib.docs.stripStorePathsFromDeclarations;
transformOptions = clanLib.docs.stripStorePathsFromDeclarations;
};
in
{

View File

@@ -1,4 +1,26 @@
{ self, lib, ... }:
let
clanModule = lib.modules.importApply ./default.nix { clan-core = self; };
in
{
flake.modules.clan.default = lib.modules.importApply ./default.nix { clan-core = self; };
flake.modules.clan.default = clanModule;
perSystem =
{
pkgs,
lib,
...
}:
let
jsonDocs = import ./eval-docs.nix {
inherit
pkgs
lib
clanModule
;
clanLib = self.clanLib;
};
in
{
legacyPackages.clan-options = jsonDocs.optionsJSON;
};
}

View File

@@ -1,24 +1,5 @@
{
self,
...
}:
{
imports = [
./clan/flake-module.nix
];
perSystem =
{
pkgs,
lib,
...
}:
let
jsonDocs = import ./eval-docs.nix {
inherit pkgs lib;
clan-core = self;
};
in
{
legacyPackages.clan-options = jsonDocs.optionsJSON;
};
}