diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index bd1a98ef9cce..c5c7187f0139 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -4,7 +4,7 @@ , requests , mypy-extensions , django_3 -, django_extensions +, django-extensions , dateparser , youtube-dl , python-crontab @@ -37,7 +37,7 @@ buildPythonApplication rec { requests mypy-extensions django_3' - django_extensions + django-extensions dateparser youtube-dl python-crontab diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 64ef525cfc84..2fcb2388b8c8 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -83,7 +83,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { daphne dateparser django-cors-headers - django_extensions + django-extensions django-filter django-picklefield django-q diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 541f0434ec00..c4b023886935 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,59 +1,54 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, django +{ lib +, buildPythonPackage +, fetchFromGitHub +, django , factory_boy -, glibcLocales , mock , pygments -, pytest -, pytest-cov , pytest-django -, python-dateutil +, pytestCheckHook , shortuuid -, six -, tox -, typing ? null , vobject , werkzeug }: buildPythonPackage rec { pname = "django-extensions"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "03mhikhh49z8bxajbjf1j790b9c9vl4zf4f86iwz7g0zrd7jqlvm"; + sha256 = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM="; }; - LC_ALL = "en_US.UTF-8"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=django_extensions --cov-report html --cov-report term" "" + ''; + + propagatedBuildInputs = [ + django + ]; + __darwinAllowLocalNetworking = true; - propagatedBuildInputs = [ six ] - ++ lib.optional (pythonOlder "3.5") typing; - checkInputs = [ - django factory_boy - glibcLocales mock pygments # not explicitly declared in setup.py, but some tests require it - pytest - pytest-cov pytest-django - python-dateutil + pytestCheckHook shortuuid - tox vobject werkzeug ]; - # remove tests that need network access - checkPhase = '' - rm tests/management/commands/test_pipchecker.py - DJANGO_SETTINGS_MODULE=tests.testapp.settings \ - pytest django_extensions tests - ''; + disabledTestPaths = [ + # requires network access + "tests/management/commands/test_pipchecker.py" + ]; meta = with lib; { description = "A collection of custom extensions for the Django Framework"; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 4d4f714e7487..f66b0a9f6b03 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -12,7 +12,7 @@ , django-paintstore , django-q , django_compressor -, django_extensions +, django-extensions , djangorestframework , flufl_lock , mistune_2_0 @@ -52,7 +52,7 @@ buildPythonPackage rec { django-mailman3 django-q django_compressor - django_extensions + django-extensions djangorestframework flufl_lock mistune_2_0 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1bccb391084a..5d19c70f03d6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -45,6 +45,7 @@ mapAliases ({ discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 django_environ = django-environ; # added 2021-12-25 + django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d70a2b95665..7a82697055ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2212,7 +2212,7 @@ in { django-environ = callPackage ../development/python-modules/django_environ { }; - django_extensions = callPackage ../development/python-modules/django-extensions { }; + django-extensions = callPackage ../development/python-modules/django-extensions { }; django-filter = callPackage ../development/python-modules/django-filter { };