b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #185809 from gador/django-4.1

Browse source
This commit is contained in:
Martin Weinelt 2022-08-10 22:12:49 +02:00 committed by GitHub
parent 56c932c50e 8149ba4d97
commit 3a11db5f40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/python-modules/diskcache/default.nix
View file

@ -43,6 +43,8 @@ buildPythonPackage rec {
"test_incr_version"
"test_get_or_set"
"test_get_many"
# see https://github.com/grantjenks/python-diskcache/issues/260
"test_cache_write_unpicklable_object"
];
pythonImportsCheck = [

6
pkgs/development/python-modules/django-js-asset/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "django-js-asset";
version = "unstable-2021-06-07";
version = "2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "matthiask";
repo = pname;
rev = "a186aa0b5721ca95da6cc032a2fb780a152f581b";
sha256 = "141zxng0wwxalsi905cs8pdppy3ad717y3g4fkdxw4n3pd0fjp8r";
rev = "refs/tags/${version}";
hash = "sha256-YDOmbqB0xDBAlOSO1UBYJ8VfRjJ8Z6Hw1i24DNSrnjw=";
};
propagatedBuildInputs = [

18
pkgs/development/python-modules/django/4.nix
View file

@ -6,6 +6,7 @@
, substituteAll
# patched in
, fetchpatch
, geos
, gdal
, withGdal ? false
@ -39,23 +40,32 @@
buildPythonPackage rec {
pname = "Django";
version = "4.0.7";
version = "4.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
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 {
src = ./django_4_set_geos_gdal_lib.patch;
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
});
})
];
propagatedBuildInputs = [
asgiref