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

Merge pull request 'clanCore: Fixed missing type null for clanIcon' (#634) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot
2023-12-08 18:33:58 +00:00
parent 28a6613bde 4a5e5feb73
commit 9f4ab67fc2
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixosModules/clanCore/flake-module.nix
View File

@@ -33,7 +33,7 @@
''; '';
}; };
clanIcon = lib.mkOption { clanIcon = lib.mkOption {
type = lib.types.path; type = lib.types.nullOr lib.types.path;
description = '' description = ''
the location of the clan icon the location of the clan icon
''; '';

1
pkgs/clan-cli/clan_cli/nix.py
View File

@@ -82,6 +82,7 @@ def nix_eval(flags: list[str]) -> list[str]:
return default_flags + flags return default_flags + flags
@deal.raises(ClanError)
def nix_metadata(flake: str) -> dict[str, Any]: def nix_metadata(flake: str) -> dict[str, Any]:
cmd = nix_command(["flake", "metadata", "--json", flake]) cmd = nix_command(["flake", "metadata", "--json", flake])
proc = subprocess.run(cmd, check=True, text=True, stdout=subprocess.PIPE) proc = subprocess.run(cmd, check=True, text=True, stdout=subprocess.PIPE)