diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-03-29 00:12:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 00:12:43 +0100 |
| commit | f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0 (patch) | |
| tree | 4b260ed8c250cd722235a78c9a2491e32b706e63 | |
| parent | 8c1931aaba2c79d644e7e14d0d9a66c9b6f93762 (diff) | |
| parent | f2d6eb213954c985379f55f939de0d4850cb0a06 (diff) | |
| download | nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar.gz nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar.bz2 nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar.lz nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar.xz nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.tar.zst nixlib-f144cea8c6fdcd5c880a3d201fab34ce7f0b39d0.zip | |
Merge pull request #299212 from mweinelt/django-5-fix-build
python312Packages.django_5: drop obsolete patch
| -rw-r--r-- | pkgs/development/python-modules/django/5.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 7bbc36f27af8..2fe896e3bd3d 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch2 , pythonOlder , substituteAll @@ -64,11 +63,6 @@ buildPythonPackage rec { # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch - (fetchpatch2 { - # fix test on 3.12; https://github.com/django/django/pull/17843 - url = "https://github.com/django/django/commit/bc8471f0aac8f0c215b9471b594d159783bac19b.patch"; - hash = "sha256-g1T9b73rmQ0uk1lB+iQy1XwK3Qin3mf5wpRsyYISJaw="; - }) ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_5_set_geos_gdal_lib.patch; |