From 540a08873a0f112eeda4b31191c45f6ca9cad69b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 17:17:40 +0200 Subject: [PATCH 1/2] python312Packages.typeshed-client: refactor --- .../python-modules/typeshed-client/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 153f8a79daf4..718ad090cb43 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , setuptools +, typing-extensions }: buildPythonPackage rec { @@ -12,7 +13,7 @@ buildPythonPackage rec { version = "2.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JelleZijlstra"; @@ -21,12 +22,13 @@ buildPythonPackage rec { hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ importlib-resources + typing-extensions ]; nativeCheckInputs = [ From 3e189c2b0d140ebc739555f3e72a69d97eb81b96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 17:18:13 +0200 Subject: [PATCH 2/2] python312Packages.typeshed-client: format with nixfmt --- .../typeshed-client/default.nix | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 718ad090cb43..196c696ff542 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, importlib-resources -, pytestCheckHook -, pythonOlder -, setuptools -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + importlib-resources, + pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -22,26 +23,18 @@ buildPythonPackage rec { hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ importlib-resources typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "typeshed_client" - ]; + pythonImportsCheck = [ "typeshed_client" ]; - pytestFlagsArray = [ - "tests/test.py" - ]; + pytestFlagsArray = [ "tests/test.py" ]; meta = with lib; { description = "Retrieve information from typeshed and other typing stubs";