pythonPackages.django: django_1_11 -> django_lts

wip/yesman
Lancelot SIX 4 years ago committed by Frederik Rietdijk
parent 17a0ec03cc
commit 2711c7477d
  1. 3
      pkgs/development/python-modules/diskcache/default.nix
  2. 3
      pkgs/development/python-modules/django-compat/default.nix
  3. 3
      pkgs/development/python-modules/mezzanine/default.nix
  4. 4
      pkgs/servers/mail/mailman/web.nix
  5. 6
      pkgs/top-level/all-packages.nix
  6. 2
      pkgs/top-level/python-packages.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
'';

@ -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";

@ -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";

@ -1,7 +1,11 @@
{ buildPythonPackage, lib, fetchgit, isPy3k
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh
, django
}:
if lib.versionOlder "2.2" django.version
then throw "mailman-web requires django < 2.2"
else
buildPythonPackage rec {
pname = "mailman-web-unstable";
version = "2019-09-29";

@ -15309,7 +15309,11 @@ in
mailman-rss = callPackage ../development/python-modules/mailman-rss { };
mailman-web = with python3.pkgs; toPythonApplication mailman-web;
mailman-web = with (python3.override {
packageOverrides = self: super: {
django = self.django_1_11;
};
}).pkgs; toPythonApplication mailman-web;
mattermost = callPackage ../servers/mattermost { };
matterircd = callPackage ../servers/mattermost/matterircd.nix { };

@ -3214,7 +3214,7 @@ in {
crayons = callPackage ../development/python-modules/crayons{ };
django = self.django_1_11;
django = self.django_lts;
django_lts = self.django_2_2;

Loading…
Cancel
Save