From d6052c34976c31c3a24c995ecc64a3675556341c Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 8 Dec 2023 19:27:58 +0100 Subject: [PATCH 1/2] clanCore: Fixed missing type null for clanIcon --- nixosModules/clanCore/flake-module.nix | 2 +- pkgs/clan-cli/clan_cli/nix.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixosModules/clanCore/flake-module.nix b/nixosModules/clanCore/flake-module.nix index ddac88f18..2d64a88c0 100644 --- a/nixosModules/clanCore/flake-module.nix +++ b/nixosModules/clanCore/flake-module.nix @@ -33,7 +33,7 @@ ''; }; clanIcon = lib.mkOption { - type = lib.types.path; + type = lib.types.either lib.types.path lib.types.null; description = '' the location of the clan icon ''; diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index 3a7aca7ee..ae47a4f48 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -82,6 +82,7 @@ def nix_eval(flags: list[str]) -> list[str]: return default_flags + flags +@deal.raises(ClanError) def nix_metadata(flake: str) -> dict[str, Any]: cmd = nix_command(["flake", "metadata", "--json", flake]) proc = subprocess.run(cmd, check=True, text=True, stdout=subprocess.PIPE) From 4a5e5feb732a48ffbf105c8404cc9cfaa246f2c3 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 8 Dec 2023 19:30:04 +0100 Subject: [PATCH 2/2] clanCore: Fixed missing type null for clanIcon --- nixosModules/clanCore/flake-module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixosModules/clanCore/flake-module.nix b/nixosModules/clanCore/flake-module.nix index 2d64a88c0..4d6dbe2e0 100644 --- a/nixosModules/clanCore/flake-module.nix +++ b/nixosModules/clanCore/flake-module.nix @@ -33,7 +33,7 @@ ''; }; clanIcon = lib.mkOption { - type = lib.types.either lib.types.path lib.types.null; + type = lib.types.nullOr lib.types.path; description = '' the location of the clan icon '';