From 59d788e1d42fe3816fa21bd1320312959e7253e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jun 2022 13:10:45 +0000 Subject: [PATCH 1/3] python310Packages.django-debug-toolbar: 3.2.4 -> 3.4 --- .../python-modules/django-debug-toolbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index f67ea344be92..cb4f97d8af2d 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.2.4"; + version = "3.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "1008yzxxs1cp1wc0xcc9xskc3f7naxc4srv1sikiank1bc3479ha"; + rev = "refs/tags/${version}"; + sha256 = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; }; propagatedBuildInputs = [ From 2d2f4f0b406a21fa8df59f27c937df2b9997ee79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Jun 2022 17:22:01 +0200 Subject: [PATCH 2/3] python310Packages.django-debug-toolbar: disable on older Python releases --- .../django-debug-toolbar/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index cb4f97d8af2d..adee04eaeed3 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -12,13 +12,15 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; version = "3.4"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; + hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; }; propagatedBuildInputs = [ @@ -42,11 +44,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Configurable set of panels that display debug information about the current request/response"; homepage = "https://github.com/jazzband/django-debug-toolbar"; changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; - maintainers = with lib.maintainers; [ yuu ]; - license = lib.licenses.bsd3; - }; + license = licenses.bsd3; + maintainers = With maintainers; [ yuu ]; +}; } From b4094c1bfa8663a0dcce484d003456df72471f99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Jun 2022 21:13:43 +0200 Subject: [PATCH 3/3] python310Packages.django-debug-toolbar: add pythonImportsCheck --- .../python-modules/django-debug-toolbar/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index adee04eaeed3..871b8bb852e6 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -44,11 +44,15 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "debug_toolbar" + ]; + meta = with lib; { description = "Configurable set of panels that display debug information about the current request/response"; homepage = "https://github.com/jazzband/django-debug-toolbar"; changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; license = licenses.bsd3; - maintainers = With maintainers; [ yuu ]; + maintainers = with maintainers; [ yuu ]; }; }