diff options
author | Lancelot SIX <lsix@lancelotsix.com> | 2020-01-28 12:27:28 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-09 09:17:31 +0100 |
commit | 2711c7477db765cabb0cad506bfb1b6f3b1e0fc2 (patch) | |
tree | 757a6b12680599e54abb2dce56a3dd25fad0a7f1 /pkgs/development | |
parent | 17a0ec03cc0c6d9f654ec1d61c0ec13543866271 (diff) | |
download | nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar.gz nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar.bz2 nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar.lz nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar.xz nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.tar.zst nixlib-2711c7477db765cabb0cad506bfb1b6f3b1e0fc2.zip |
pythonPackages.django: django_1_11 -> django_lts
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/python-modules/diskcache/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/python-modules/django-compat/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/python-modules/mezzanine/default.nix | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index a420fc037bbe..793b0edd6974 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -6,6 +6,7 @@ , pytest_xdist , pytest-django , mock +, django }: buildPythonPackage rec { @@ -27,6 +28,8 @@ buildPythonPackage rec { mock ]; + disabled = lib.versionAtLeast django.version "2.0"; + checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 32d85cfadd71..de180ca03e55 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,6 +1,9 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python, django, six }: +if stdenv.lib.versionAtLeast django.version "2.0" +then throw "django-compat requires django < 2.0" +else buildPythonPackage rec { pname = "django-compat"; version = "1.0.15"; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index a831618134bc..567a1c66e029 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -18,6 +18,9 @@ , chardet }: +if stdenv.lib.versionOlder django.version "1.11" || stdenv.lib.versionAtLeast django.version "2.0" +then throw "mezzanine requires django-1.11. Consider overriding python package set to use django_1_11" +else buildPythonPackage rec { version = "4.3.1"; pname = "Mezzanine"; |