diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-03-10 12:15:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 12:15:28 +0100 |
| commit | 450d04aa69524cf8787a1687963386fde76054e4 (patch) | |
| tree | 01b225340475f287cc14bbc85c9ee1b98f57bdd3 | |
| parent | 27a523860dc100df9de979dfea65a38a49d86efc (diff) | |
| parent | 60f5035dccf01ceeb9f182635109c98b3e2c3b26 (diff) | |
| download | nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar.gz nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar.bz2 nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar.lz nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar.xz nixlib-450d04aa69524cf8787a1687963386fde76054e4.tar.zst nixlib-450d04aa69524cf8787a1687963386fde76054e4.zip | |
Merge pull request #294651 from a-n-n-a-l-e-e/django-remove-patch
python311Packages.django_4: remove patch, fix build
| -rw-r--r-- | pkgs/development/python-modules/django/4.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index ba06441fc882..e6b2b8991f39 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch2 , pythonOlder , substituteAll @@ -62,11 +61,6 @@ buildPythonPackage rec { # and disable failing tests ./django_4_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_4_set_geos_gdal_lib.patch; |