From 6109efe52eab33d946eb8c841a57739913e02be2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 18:06:23 +0000 Subject: [PATCH 1/2] clairvoyance: 2.5.3 -> 2.5.4 --- pkgs/by-name/cl/clairvoyance/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix index 986f22edecf2..668df09dec20 100644 --- a/pkgs/by-name/cl/clairvoyance/package.nix +++ b/pkgs/by-name/cl/clairvoyance/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "clairvoyance"; - version = "2.5.3"; + version = "2.5.4"; format = "pyproject"; src = fetchFromGitHub { owner = "nikitastupin"; repo = "clairvoyance"; tag = "v${version}"; - hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA="; + hash = "sha256-5PbvR0HVvA2xFzD+Jtisxuk68pdM29NyweFbZKBbhzs="; }; pythonRelaxDeps = [ "rich" ]; @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { description = "Tool to obtain GraphQL API schemas"; mainProgram = "clairvoyance"; homepage = "https://github.com/nikitastupin/clairvoyance"; - changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/v${version}"; + changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/${src.tag}"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ fab ]; }; From d757c6b02ae22f8a44176e53ec950b04ff72dd3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Aug 2025 11:51:15 +0200 Subject: [PATCH 2/2] clairvoyance: refactor --- pkgs/by-name/cl/clairvoyance/package.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix index 668df09dec20..858472216a05 100644 --- a/pkgs/by-name/cl/clairvoyance/package.nix +++ b/pkgs/by-name/cl/clairvoyance/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "clairvoyance"; version = "2.5.4"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "nikitastupin"; @@ -18,11 +18,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "rich" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ aiohttp rich ]; @@ -37,9 +35,7 @@ python3.pkgs.buildPythonApplication rec { --replace 'asyncio = "^3.4.3"' "" ''; - pythonImportsCheck = [ - "clairvoyance" - ]; + pythonImportsCheck = [ "clairvoyance" ]; disabledTests = [ # KeyError @@ -48,10 +44,10 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to obtain GraphQL API schemas"; - mainProgram = "clairvoyance"; homepage = "https://github.com/nikitastupin/clairvoyance"; changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "clairvoyance"; }; }