diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-03 23:35:07 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-14 00:29:04 +0100 |
commit | 36ac329f39d30c33972062a1ccbe6b14ef612a33 (patch) | |
tree | 7f1b8bf3be7183627bb73ffbe7f105d9a6991198 | |
parent | d713dfae5e9a5853c394221281683ad98c9940b4 (diff) | |
download | nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar.gz nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar.bz2 nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar.lz nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar.xz nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.tar.zst nixpkgs-36ac329f39d30c33972062a1ccbe6b14ef612a33.zip |
python3Packages.django-appconf: rename from django_appconf, clean up
-rw-r--r-- | pkgs/development/python-modules/django-appconf/default.nix (renamed from pkgs/development/python-modules/django_appconf/default.nix) | 33 | ||||
-rw-r--r-- | pkgs/development/python-modules/django-statici18n/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/django_compressor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 28 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index 5da9ed0ca26..bfa0cac6443 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -1,7 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, django +, six +, python +}: + buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "django-compressor"; @@ -10,20 +21,20 @@ buildPythonPackage rec { sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; }; - propagatedBuildInputs = [ six django ]; - - patches = [ - (fetchpatch { - name = "backport_django_2_2.patch"; - url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch"; - sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw"; - }) + propagatedBuildInputs = [ + django + six ]; - checkPhase = '' + preCheck = '' # prove we're running tests against installed package, not build dir rm -r appconf - python -m django test --settings="tests.test_settings" + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test --settings=tests.test_settings + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 78c807903c4..db7d36c8993 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django, django_appconf }: +{ lib, buildPythonPackage, fetchPypi, django, django-appconf }: buildPythonPackage rec { pname = "django-statici18n"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; - propagatedBuildInputs = [ django django_appconf ]; + propagatedBuildInputs = [ django django-appconf ]; # pypi package does not contains test harness # source tarball requires setting up a config diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index a8204eab5fa..82684b52374 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django_appconf }: + rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { pname = "django_compressor"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # requires django-sekizai, which we don't have packaged yet doCheck = false; - propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39e4c787f5e..0126ac46390 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 765a5e31724..c502b6751b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2219,7 +2219,7 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; - django_appconf = callPackage ../development/python-modules/django_appconf { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; |