diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/python-modules/django')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix (renamed from infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix) | 4 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix | 48 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch | 24 |
3 files changed, 74 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix index 3a88f0703d06..64897890759e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.16"; + version = "2.2.17"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2"; + sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861"; }; patches = stdenv.lib.optional withGdal diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix new file mode 100644 index 000000000000..c3644d6946fd --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, geos +, gdal +, asgiref +, pytz +, sqlparse +, pythonOlder +, withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "3.1.4"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03"; + }; + + 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 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch new file mode 100644 index 000000000000..6b853f8d85f0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch @@ -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: |