Unverified Commit ad7efee1 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #309652 from mweinelt/django-5.0.5 

python312Packages.django_5: 5.0.4 -> 5.0.5
parents 8907c101 efd232d7

pkgs/development/python-modules/django/5.nix

+7 −13
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildPythonPackage

, fetchPypi

, fetchFromGitHub

, fetchpatch2

, pythonAtLeast

, pythonOlder
@@ -44,15 +44,16 @@ 


buildPythonPackage rec {

  pname = "django";

  version = "5.0.4";

  version = "5.0.5";

  pyproject = true;



  disabled = pythonOlder "3.10";



  src = fetchPypi {

    pname = "Django";

    inherit version;

    hash = "sha256-S9AajIMLt3qKOw59iyW4h+U2rReoG6Lc5UdhNcczEr0=";

  src = fetchFromGitHub {

    owner = "django";

    repo = "django";

    rev = "refs/tags/${version}";

    hash = "sha256-0/AbPmTl38E9BpHVKs0r79fISjEa1d4XO/se1pA7zxg=";

  };



  patches = [
@@ -65,13 +66,6 @@ buildPythonPackage rec { 
    # disable test that excpects timezone issues

    ./django_5_disable_failing_tests.patch



    (fetchpatch2 {

      # https://github.com/django/django/pull/17979

      name = "django-mime-utf8-surrogates.patch";

      url = "https://github.com/django/django/commit/b231bcd19e57267ce1fc21d42d46f0b65fdcfcf8.patch";

      hash = "sha256-HhmRwi24VkoPoh+NygAThCoMywoMwrLijU4ZsDfVU34=";

    })



  ] ++ lib.optionals withGdal [

    (substituteAll {

      src = ./django_5_set_geos_gdal_lib.patch;