pythonPackages.django_3: init at 3.1

This commit is contained in:
Frederik Rietdijk 2020-08-29 14:57:03 +02:00
parent ef92fe9c43
commit f9ae2b7dac
3 changed files with 74 additions and 0 deletions

View File

@ -0,0 +1,48 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, substituteAll
, geos
, gdal
, asgiref
, pytz
, sqlparse
, pythonOlder
, withGdal ? false
}:
buildPythonPackage rec {
pname = "Django";
version = "3.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "2d390268a13c655c97e0e2ede9d117007996db692c1bb93eabebd4fb7ea7012b";
};
patches = stdenv.lib.optional withGdal
(substituteAll {
src = ./django_3_set_geos_gdal_lib.patch;
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
});
propagatedBuildInputs = [
asgiref
pytz
sqlparse
];
# too complicated to setup
doCheck = false;
meta = with stdenv.lib; {
description = "A high-level Python Web framework";
homepage = "https://www.djangoproject.com/";
license = licenses.bsd3;
maintainers = with maintainers; [ georgewhewell lsix ];
};
}

View File

@ -0,0 +1,24 @@
diff -Nur a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
--- a/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:34:05.330568948 +0100
+++ b/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:35:08.679095615 +0100
@@ -14,7 +14,7 @@
from django.conf import settings
lib_path = settings.GDAL_LIBRARY_PATH
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
- lib_path = None
+ lib_path = "@gdal@/lib/libgdal@extension@"
if lib_path:
lib_names = None
diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
--- a/django/contrib/gis/geos/libgeos.py 2020-07-09 22:34:05.331568941 +0100
+++ b/django/contrib/gis/geos/libgeos.py 2020-07-09 22:36:24.863526276 +0100
@@ -24,7 +24,7 @@
from django.conf import settings
lib_path = settings.GEOS_LIBRARY_PATH
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
- lib_path = None
+ lib_path = "@geos@/lib/libgeos_c@extension@"
# Setting the appropriate names for the GEOS-C library.
if lib_path:

View File

@ -1599,6 +1599,8 @@ in {
django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
django_3 = callPackage ../development/python-modules/django/3.nix { };
django-allauth = callPackage ../development/python-modules/django-allauth { };
django-anymail = callPackage ../development/python-modules/django-anymail { };