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

Merge pull request #185809 from gador/django-4.1

parents 56c932c5 8149ba4d

pkgs/development/python-modules/diskcache/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 = [

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

+3 −3
Original line number Diff line number Diff line
@@ -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 = [

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

+14 −4
Original line number Diff line number Diff line
@@ -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