From 9a8d6afb354aeb3d2462b8102c6237bbbd923264 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Apr 2023 23:14:14 +0200 Subject: [PATCH 1/2] python310Packages.django-stubs-ext: 0.8.0 -> 4.2.0 --- .../django-stubs-ext/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index db5dc9c91583..296e394953fc 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -1,18 +1,39 @@ -{ buildPythonPackage, django, fetchPypi, lib, typing-extensions }: +{ lib +, buildPythonPackage +, django +, fetchPypi +, pytestCheckHook +, pythonOlder +, typing-extensions +}: buildPythonPackage rec { pname = "django-stubs-ext"; - version = "0.8.0"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mpup4oCHN5Sd6WoPzosFTxLTjkYQEdd+vAdP/oxD38s="; + hash = "sha256-d4nwyuynFS/vB61rlN7HMQoF0Ljat395eeGdsAN7USc="; }; # setup.cfg tries to pull in nonexistent LICENSE.txt file postPatch = "rm setup.cfg"; - propagatedBuildInputs = [ django typing-extensions ]; + propagatedBuildInputs = [ + django + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "django_stubs_ext" + ]; meta = with lib; { description = "Extensions and monkey-patching for django-stubs"; From f20662b573e0b7b3fdb938b06be575cb347d70c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Apr 2023 23:18:24 +0200 Subject: [PATCH 2/2] python310Packages.django-stubs: 1.15.0 -> 4.2.0 Changelog: https://github.com/typeddjango/django-stubs/releases/tag/4.2.0 --- .../python-modules/django-stubs/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 662a4db74b63..037d1f31ee98 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -1,9 +1,11 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , django , django-stubs-ext , fetchPypi -, lib , mypy +, pytestCheckHook +, pythonOlder , tomli , types-pytz , types-pyyaml @@ -12,26 +14,35 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "1.15.0"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C7+esXLFsG7M/y1wTHw5BuSixhRt+MMu6fOlHikmVYE="; + hash = "sha256-k7r/gk8KBW5xA2tCO5QqdPB7kJ5F4/o4GFuRD1l8XAg="; }; propagatedBuildInputs = [ django django-stubs-ext mypy - tomli types-pytz types-pyyaml typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { description = "PEP-484 stubs for Django"; homepage = "https://github.com/typeddjango/django-stubs"; + changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; };