From 33ee10c80ec35dabd5296678472f93f216d3ac18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Aug 2022 00:21:16 +0200 Subject: [PATCH] python3Packages.django-compressor: rename from django_compressor --- pkgs/applications/networking/seahub/default.nix | 2 +- .../{django_compressor => django-compressor}/default.nix | 2 +- pkgs/development/python-modules/django-mailman3/default.nix | 4 ++-- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/web-apps/healthchecks/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{django_compressor => django-compressor}/default.nix (96%) diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 235b3026a6d2..bf236e179ccd 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -40,6 +40,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ django future + django-compressor django-statici18n django-webpack-loader django-simple-captcha @@ -48,7 +49,6 @@ python.pkgs.buildPythonApplication rec { mysqlclient pillow python-dateutil - django_compressor djangorestframework openpyxl requests diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix similarity index 96% rename from pkgs/development/python-modules/django_compressor/default.nix rename to pkgs/development/python-modules/django-compressor/default.nix index f71582418449..f07461f1bdd8 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -2,7 +2,7 @@ rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { - pname = "django_compressor"; + pname = "django-compressor"; version = "4.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index cc04bf0d441f..9486764e2783 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor , django-allauth, mailmanclient, django, mock }: @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django-gravatar2 django_compressor django-allauth mailmanclient + django-gravatar2 django-compressor django-allauth mailmanclient ]; checkInputs = [ django mock ]; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 2b8959a8f37b..406e104e881c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { django-haystack django-mailman3 django-q - django_compressor + django-compressor django-extensions djangorestframework flufl_lock diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index aef269907ac1..2f0f3740ca55 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -38,7 +38,7 @@ py.pkgs.buildPythonApplication rec { cronsim cryptography django - django_compressor + django-compressor fido2 minio psycopg2 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5122f35a058e..29dda4426854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2378,7 +2378,7 @@ in { django_compat = callPackage ../development/python-modules/django-compat { }; - django_compressor = callPackage ../development/python-modules/django_compressor { }; + django-compressor = callPackage ../development/python-modules/django-compressor { }; django-configurations = callPackage ../development/python-modules/django-configurations { };