From a7223f02b52b09b56ced3677c9bcfb4d4c297ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 7 May 2021 11:58:26 +0200
Subject: [PATCH 1/2] python3Packages.django_2_2: move expression to ease
 backporting

---
 pkgs/development/python-modules/django/{2_2.nix => 2.nix} | 0
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/python-modules/django/{2_2.nix => 2.nix} (100%)

diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2.nix
similarity index 100%
rename from pkgs/development/python-modules/django/2_2.nix
rename to pkgs/development/python-modules/django/2.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e02424f01d5..bf3e3b95f09a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1563,7 +1563,7 @@ in {
 
   distutils_extra = callPackage ../development/python-modules/distutils_extra { };
 
-  django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
+  django_2_2 = callPackage ../development/python-modules/django/2.nix { };
 
   django-allauth = callPackage ../development/python-modules/django-allauth { };
 

From 177732cf2e7c0aed24766ec25ce344829415bb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 6 May 2021 15:18:50 +0200
Subject: [PATCH 2/2] python3Packages.django_2_2: 2.2.20 -> 2.2.22

https://www.djangoproject.com/weblog/2021/may/06/security-releases/
(cherry picked from commit 2e0b8acd823c1166d48097891368d59aac821e0d)
---
 pkgs/development/python-modules/django/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
index 9cdc24ec87c4..d7c216436a37 100644
--- a/pkgs/development/python-modules/django/2.nix
+++ b/pkgs/development/python-modules/django/2.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.2.20";
+  version = "2.2.22";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95";
+    sha256 = "db2214db1c99017cbd971e58824e6f424375154fe358afc30e976f5b99fc6060";
   };
 
   patches = stdenv.lib.optional withGdal