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

Merge pull request 'chore(clan/cli): remove explizit dependency on jsonschema converter.' (#3277) from hsjobeki/clan-core:chores into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3277
This commit is contained in:
hsjobeki
2025-04-10 21:10:43 +00:00
parent 97c1dd7700 cf273d2209
commit f94e3a20a4
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,
nixpkgs,
includedRuntimeDeps,
inventory-schema-abstract,
classgen,
pythonRuntime,
templateDerivation,
}:
@@ -59,8 +57,6 @@ let
chmod -R +w $out
ln -sf ${nixpkgs'} $out/clan_cli/nixpkgs
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

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

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