diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 887cdb87608c..829def809d0c 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -66,7 +66,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { django-storages django-tables2 django-webpack-loader - django_treebeard + django-treebeard djangorestframework drf-writable-nested gunicorn diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index 379b63642321..774bcda4ba83 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -7,7 +7,7 @@ , django-debug-toolbar , django-extensions , django-taggit -, django_tagging +, django-tagging , mock , pytest-django , selenium @@ -41,7 +41,7 @@ buildPythonPackage rec { django-debug-toolbar django-extensions django-taggit - django_tagging + django-tagging mock pytest-django selenium diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index 2b2fe06de614..3e413ca4e15a 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -7,14 +7,15 @@ }: buildPythonPackage rec { - pname = "django_celery_results"; + pname = "django-celery-results"; version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "django_celery_results"; + inherit version; hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; }; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django-classy-tags/default.nix similarity index 100% rename from pkgs/development/python-modules/django_classytags/default.nix rename to pkgs/development/python-modules/django-classy-tags/default.nix diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django-colorful/default.nix similarity index 100% rename from pkgs/development/python-modules/django_colorful/default.nix rename to pkgs/development/python-modules/django-colorful/default.nix diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django-contrib-comments/default.nix similarity index 100% rename from pkgs/development/python-modules/django_contrib_comments/default.nix rename to pkgs/development/python-modules/django-contrib-comments/default.nix diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix similarity index 100% rename from pkgs/development/python-modules/django_environ/default.nix rename to pkgs/development/python-modules/django-environ/default.nix diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 47719995c69a..18ef2e3ace79 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -11,7 +11,7 @@ # dependencies , django -, django_compat +, django-compat # tests , pytest-django @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - django_compat + django-compat ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix similarity index 100% rename from pkgs/development/python-modules/django_modelcluster/default.nix rename to pkgs/development/python-modules/django-modelcluster/default.nix diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django-nose/default.nix similarity index 100% rename from pkgs/development/python-modules/django_nose/default.nix rename to pkgs/development/python-modules/django-nose/default.nix diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index f590aca527f4..673a86797266 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - numpy, django_colorful, pillow, psycopg2, + numpy, django-colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require a postgresql + postgis server doCheck = false; - propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + propagatedBuildInputs = [ numpy django-colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 3c4e351f25b4..0c28ee283a1d 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, django_classytags +, django-classy-tags , pytestCheckHook , pytest-django }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django_classytags + django-classy-tags ]; checkInputs = [ diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix similarity index 100% rename from pkgs/development/python-modules/django_silk/default.nix rename to pkgs/development/python-modules/django-silk/default.nix diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django-tagging/default.nix similarity index 100% rename from pkgs/development/python-modules/django_tagging/default.nix rename to pkgs/development/python-modules/django-tagging/default.nix diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix similarity index 100% rename from pkgs/development/python-modules/django_treebeard/default.nix rename to pkgs/development/python-modules/django-treebeard/default.nix diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index f20e251fadd8..d80ed27297cc 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -4,7 +4,7 @@ , python , cairocffi , django -, django_tagging +, django-tagging , fetchFromGitHub , fetchpatch , gunicorn @@ -49,7 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cairocffi django - django_tagging + django-tagging gunicorn pyparsing python-memcached diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d9e537b057df..9eda32b4e48a 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , chardet , django -, django_contrib_comments +, django-contrib-comments , fetchPypi , filebrowser_safe , future @@ -42,7 +42,7 @@ buildPythonPackage rec { bleach chardet django - django_contrib_comments + django-contrib-comments filebrowser_safe future grappelli_safe diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 2bbff0485b21..c01464f27ceb 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -7,7 +7,7 @@ , django-filter , django-modelcluster , django-taggit -, django_treebeard +, django-treebeard , djangorestframework , draftjs-exporter , fetchPypi @@ -43,7 +43,7 @@ buildPythonPackage rec { anyascii beautifulsoup4 django - django_treebeard + django-treebeard django-filter django-modelcluster django-taggit diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8aa2b0d21b7b..f20d8a2d6b5d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,10 @@ mapAliases ({ django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 + django_classytags = django-classy-tags; # added 2023-07-25 + django_colorful = django-colorful; # added 2023-07-25 + django_compat = django-compat; # added 2023-07-25 + django_contrib_comments = django-contrib-comments; # added 2023-07-25 django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 @@ -93,10 +97,14 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django_nose = django-nose; # added 2023-07-25 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 + django_silk = django-silk; # added 2023-07-25 + django_tagging = django-tagging; # added 2023-07-25 django_taggit = django-taggit; # added 2021-10-11 + django_treebeard = django-treebeard; # added 2023-07-25 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2f1691e5815..7106cd66f807 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2771,13 +2771,13 @@ self: super: with self; { django-ckeditor = callPackage ../development/python-modules/django-ckeditor { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-classy-tags = callPackage ../development/python-modules/django-classy-tags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; + django-colorful = callPackage ../development/python-modules/django-colorful { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-compat = callPackage ../development/python-modules/django-compat { }; django-compressor = callPackage ../development/python-modules/django-compressor { }; @@ -2787,7 +2787,7 @@ self: super: with self; { django-context-decorator = callPackage ../development/python-modules/django-context-decorator { }; - django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-contrib-comments = callPackage ../development/python-modules/django-contrib-comments { }; django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; @@ -2805,7 +2805,7 @@ self: super: with self; { django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; - django-environ = callPackage ../development/python-modules/django_environ { }; + django-environ = callPackage ../development/python-modules/django-environ { }; django-extensions = callPackage ../development/python-modules/django-extensions { }; @@ -2861,7 +2861,7 @@ self: super: with self; { django-model-utils = callPackage ../development/python-modules/django-model-utils { }; - django-modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; @@ -2871,7 +2871,7 @@ self: super: with self; { django-mysql = callPackage ../development/python-modules/django-mysql { }; - django_nose = callPackage ../development/python-modules/django_nose { }; + django-nose = callPackage ../development/python-modules/django-nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -2943,7 +2943,7 @@ self: super: with self; { django-sesame = callPackage ../development/python-modules/django-sesame { }; - django_silk = callPackage ../development/python-modules/django_silk { }; + django-silk = callPackage ../development/python-modules/django-silk { }; django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; @@ -2961,7 +2961,7 @@ self: super: with self; { django-tables2 = callPackage ../development/python-modules/django-tables2 { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; + django-tagging = callPackage ../development/python-modules/django-tagging { }; django-taggit = callPackage ../development/python-modules/django-taggit { }; @@ -2969,7 +2969,7 @@ self: super: with self; { django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; - django_treebeard = callPackage ../development/python-modules/django_treebeard { }; + django-treebeard = callPackage ../development/python-modules/django-treebeard { }; django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { };