From 0addba0d203efa971483599f4b80bbfe12caf527 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 16 Sep 2024 14:17:23 +0200 Subject: [PATCH] Update: inventory classes check --- pkgs/clan-cli/clan_cli/inventory/update.sh | 2 +- pkgs/clan-cli/flake-module.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/inventory/update.sh b/pkgs/clan-cli/clan_cli/inventory/update.sh index 5d1bf5214..4debccddf 100755 --- a/pkgs/clan-cli/clan_cli/inventory/update.sh +++ b/pkgs/clan-cli/clan_cli/inventory/update.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -jsonSchema=$(nix build .#inventory-schema --print-out-paths)/schema.json +jsonSchema=$(nix build .#inventory-schema-abstract --print-out-paths)/schema.json nix run .#classgen "$jsonSchema" "$PKG_ROOT/clan_cli/inventory/classes.py" \ No newline at end of file diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix index 3f8399cd6..59e6bb093 100644 --- a/pkgs/clan-cli/flake-module.nix +++ b/pkgs/clan-cli/flake-module.nix @@ -124,7 +124,7 @@ classFile = "classes.py"; }; installPhase = '' - ${self'.packages.classgen}/bin/classgen ${self'.packages.inventory-schema}/schema.json b_classes.py --stop-at "Service" + ${self'.packages.classgen}/bin/classgen ${self'.packages.inventory-schema-abstract}/schema.json b_classes.py --stop-at "Service" file1=$classFile file2=b_classes.py