From 7d0356ef2b50f84c723305c6dc1d064387ef0a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 04:33:18 +0000 Subject: [PATCH 1/2] python312Packages.django-debug-toolbar: 4.4.2 -> 4.4.6 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 99bb0afb9178..f4c3d8e27ed3 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.4.2"; + version = "4.4.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZfGDXyrHwlFpeGK1QTD4nlGWdbEK7+hurOVkAAp/LyA="; + hash = "sha256-eLC3GnhYuEunKkKXNMtaFCqjyf8rn5cTkjL7Ep4Qp3c="; }; nativeBuildInputs = [ hatchling ]; From 76d598a9a63c24a63fce74303ce3c769db581e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 30 Jul 2024 20:25:22 +0200 Subject: [PATCH 2/2] python312Packages.django-graphiql-debug-toolbar: fix compatibility with django-debug-toolbar, use pyproject = true --- .../django-graphiql-debug-toolbar/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix index 63140be2e28b..cbd1e348c74d 100644 --- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, # build-system poetry-core, @@ -13,7 +14,6 @@ graphene-django, # tests - python, pytest-django, pytestCheckHook }: @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-graphiql-debug-toolbar"; version = "0.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -31,9 +31,18 @@ buildPythonPackage rec { sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw"; }; - nativeBuildInputs = [ poetry-core ]; + patches = [ + # Add compatibility for py-django-debug-toolbar >= 4.4.6 + # https://github.com/flavors/django-graphiql-debug-toolbar/pull/27 + (fetchpatch { + url = "https://github.com/flavors/django-graphiql-debug-toolbar/commit/2b42fdb1bc40109d9bb0ae1fb4d2163d13904724.patch"; + hash = "sha256-ywTLqXlAxA2DCacrJOqmB7jSzfpeuGTX2ETu0fKmhq4="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ django django-debug-toolbar graphene-django