From 897b67b32470c9c5744a758355ad2ceb653d38e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:14:31 +0100 Subject: [PATCH] django-crispy-forms: 2019.04.21 -> 1.10.0 --- .../python-modules/django-crispy-forms.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c470a56b8a1..f8b91a94ccc 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest_4, pytest-django, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-django +, django +}: -buildPythonPackage { +buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2019.04.21"; + version = "1.10.0"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - rev = "e25a5326697e5b545689b3a914e516404a6911bb"; - sha256 = "12zqa76q6i7j47aqvhilivpbdplgp9zw2q8zfcjzlgclrqafaj39"; + rev = version; + sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5"; }; # For reasons unknown, the source dir must contain a dash @@ -19,12 +24,10 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest_4 pytest-django django ]; + checkInputs = [ django pytest-django pytestCheckHook ]; - checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings \ - pytest crispy_forms/tests + preCheck = '' + export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings ''; meta = with lib; {