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

chore(clan/cli): remove explizit dependency on jsonschema converter.

Browse Source 
Regenerating the classes from json schema as part of the clan/cli is a bit redundant since we need to vendor the classes by hand anyways
The user can also not practically override the inventory options
I would disable this for now; until we really need it.
We now solely rely on CI checks failing if the classes are out of sync
This commit is contained in:
Johannes Kirschbauer
2025-04-10 22:58:30 +02:00
parent ffb1d51fc4
commit cf273d2209
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/default.nix
View File

@@ -12,8 +12,6 @@
clan-core-path, clan-core-path,
nixpkgs, nixpkgs,
includedRuntimeDeps, includedRuntimeDeps,
inventory-schema-abstract,
classgen,
pythonRuntime, pythonRuntime,
templateDerivation, templateDerivation,
}: }:
@@ -59,8 +57,6 @@ let
chmod -R +w $out chmod -R +w $out
ln -sf ${nixpkgs'} $out/clan_cli/nixpkgs ln -sf ${nixpkgs'} $out/clan_cli/nixpkgs
cp -r ${../../templates} $out/clan_cli/templates cp -r ${../../templates} $out/clan_cli/templates
${classgen}/bin/classgen ${inventory-schema-abstract}/schema.json $out/clan_cli/inventory/classes.py
''; '';
# Create a custom nixpkgs for use within the project # Create a custom nixpkgs for use within the project

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

@@ -133,8 +133,6 @@
packages = { packages = {
clan-cli = pkgs.callPackage ./default.nix { clan-cli = pkgs.callPackage ./default.nix {
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs;
inherit (self'.packages) classgen;
inherit (self'.legacyPackages.schemas) inventory-schema-abstract;
templateDerivation = templateDerivation; templateDerivation = templateDerivation;
pythonRuntime = pkgs.python3; pythonRuntime = pkgs.python3;
clan-core-path = clanCoreWithVendoredDeps; clan-core-path = clanCoreWithVendoredDeps;
@@ -145,8 +143,6 @@
}; };
clan-cli-full = pkgs.callPackage ./default.nix { clan-cli-full = pkgs.callPackage ./default.nix {
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs;
inherit (self'.packages) classgen;
inherit (self'.legacyPackages.schemas) inventory-schema-abstract;
clan-core-path = clanCoreWithVendoredDeps; clan-core-path = clanCoreWithVendoredDeps;
templateDerivation = templateDerivation; templateDerivation = templateDerivation;
pythonRuntime = pkgs.python3; pythonRuntime = pkgs.python3;
@@ -163,8 +159,6 @@
]; ];
installPhase = '' installPhase = ''
${self'.packages.classgen}/bin/classgen ${self'.legacyPackages.schemas.inventory-schema-abstract}/schema.json ./clan_cli/inventory/classes.py
python docs.py reference python docs.py reference
mkdir -p $out mkdir -p $out
cp -r out/* $out cp -r out/* $out
@@ -182,7 +176,6 @@
]; ];
installPhase = '' installPhase = ''
${self'.packages.classgen}/bin/classgen ${self'.legacyPackages.schemas.inventory-schema-abstract}/schema.json ./clan_cli/inventory/classes.py
mkdir -p $out mkdir -p $out
# Retrieve python API Typescript types # Retrieve python API Typescript types
python api.py > $out/API.json python api.py > $out/API.json