python310Packages.django_4: 4.0.7 -> 4.1
Applies a patch to fix a regression in the sqlite database backend. Co-Authored-By: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
parent
f1671c8cfe
commit
ba0aeaf429
1 changed files with 14 additions and 4 deletions
|
@ -6,6 +6,7 @@
|
||||||
, substituteAll
|
, substituteAll
|
||||||
|
|
||||||
# patched in
|
# patched in
|
||||||
|
, fetchpatch
|
||||||
, geos
|
, geos
|
||||||
, gdal
|
, gdal
|
||||||
, withGdal ? false
|
, withGdal ? false
|
||||||
|
@ -39,23 +40,32 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "Django";
|
pname = "Django";
|
||||||
version = "4.0.7";
|
version = "4.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-nG1a02vnmOVi3cqmsXscP/LTxPUppHQytp+5ow+EdGE=";
|
hash = "sha256-Ay+Kb8fPBczRIU5KLiHfzWojudV1xlc8rMjGeCjb5kI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optional withGdal
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
# Fix regression in sqlite backend introduced in 4.1.
|
||||||
|
# https://github.com/django/django/pull/15925
|
||||||
|
url = "https://github.com/django/django/commit/c0beff21239e70cbdcc9597e5be09e505bb8f76c.patch";
|
||||||
|
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
|
||||||
|
excludes = [ "docs/releases/4.1.1.txt" ];
|
||||||
|
})
|
||||||
|
] ++ lib.optionals withGdal [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./django_4_set_geos_gdal_lib.patch;
|
src = ./django_4_set_geos_gdal_lib.patch;
|
||||||
geos = geos;
|
geos = geos;
|
||||||
gdal = gdal;
|
gdal = gdal;
|
||||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||||
});
|
})
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
asgiref
|
asgiref
|
||||||
|
|
Loading…
Reference in a new issue