Merge pull request 'jsonschema: fix eval' (#353) from Mic92-main into main

Reviewed-on: #353

lib/jsonschema/default.nix

@@ -15,7 +15,7 @@ let
 
   # throw error if option type is not supported
   notSupported = option: throw
-    "option type '${option.type.description}' not supported by jsonschema converter";
+    "option type '${option.type.name}' ('${option.type.description}') not supported by jsonschema converter";
 
 in
 rec {
@@ -91,7 +91,7 @@ rec {
     }
 
     # parse int
-    else if option.type.name == "int"
+    else if (option.type.name == "int" || option.type.name == "positiveInt")
     # return jsonschema property definition for int
     then default // description // {
       type = "integer";

pkgs/clan-cli/clan_cli/nix.py

@@ -8,7 +8,7 @@ from .dirs import nixpkgs_flake, nixpkgs_source
 
 
 def nix_command(flags: list[str]) -> list[str]:
-    return ["nix", "--experimental-features", "nix-command flakes"] + flags
+    return ["nix", "--extra-experimental-features", "nix-command flakes"] + flags
 
 
 def nix_build(
@@ -20,8 +20,6 @@ def nix_build(
                 "build",
                 "--no-link",
                 "--print-out-paths",
-                "--extra-experimental-features",
-                "nix-command flakes",
             ]
         )
         + flags

pkgs/clan-cli/default.nix

@@ -89,7 +89,7 @@ let
     ln -s ${nixpkgs} $out/path
     nix flake lock $out \
       --store ./. \
-      --experimental-features 'nix-command flakes' \
+      --extra-experimental-features 'nix-command flakes' \
       --override-input nixpkgs ${nixpkgs}
   '';
 in