Merge staging into staging-next

2020-02-09 16:38:32 +01:00
parent 531a48ebdb 3b17e6559b
commit cffec212dc
60 changed files with 1394 additions and 1411 deletions
@@ -3228,7 +3228,9 @@ in {

  crayons = callPackage ../development/python-modules/crayons{ };

-  django = self.django_1_11;
+  django = self.django_lts;
+
+  django_lts = self.django_2_2;

  django_1_11 = callPackage ../development/python-modules/django/1_11.nix {
    gdal = self.gdal;