From 89a60382e4895149dc705ef002a343abdeaa579b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 13:49:32 +0100
Subject: [PATCH] Revert "Revert "pythonPackages.django: clarify versions,
 remove django_lts attribute""

Every major version will have only a single LTS release, which is the
one we typically keep in Nixpkgs.

https://www.djangoproject.com/download/

This reverts commit af8a48c3c12fc731f96eaa85a4531bea013d13c8.
---
 .../office/paperless/python-modules/default.nix        |  2 +-
 .../python-modules/django-oauth-toolkit/default.nix    |  4 ++--
 .../python-modules/django/{2_2.nix => 2.nix}           |  0
 pkgs/top-level/python-packages.nix                     | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/development/python-modules/django/{2_2.nix => 2.nix} (100%)

diff --git a/pkgs/applications/office/paperless/python-modules/default.nix b/pkgs/applications/office/paperless/python-modules/default.nix
index 40a496312fa..4c5510ebb74 100644
--- a/pkgs/applications/office/paperless/python-modules/default.nix
+++ b/pkgs/applications/office/paperless/python-modules/default.nix
@@ -1,6 +1,6 @@
 pyPkgs: fetchFromGitHub:
 {
-  django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec {
+  django_2_0 = pyPkgs.django_2.overridePythonAttrs (old: rec {
     version = "2.0.12";
     src = pyPkgs.fetchPypi {
       inherit (old) pname;
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 700fc3ae4e8..83f1049a2e5 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, django_2_2, requests, oauthlib
+, django, requests, oauthlib
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6";
   };
 
-  propagatedBuildInputs = [ django_2_2 requests oauthlib ];
+  propagatedBuildInputs = [ django requests oauthlib ];
 
   # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
   doCheck = false;
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 26347eed8e1..bcbc6a9ba98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1597,8 +1597,12 @@ in {
 
   distutils_extra = callPackage ../development/python-modules/distutils_extra { };
 
-  django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
+  django = self.django_2;
 
+  # Current LTS
+  django_2 = callPackage ../development/python-modules/django/2.nix { };
+
+  # Current latest
   django_3 = callPackage ../development/python-modules/django/3.nix { };
 
   django-allauth = callPackage ../development/python-modules/django-allauth { };
@@ -1658,8 +1662,6 @@ in {
 
   django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
 
-  django_lts = self.django_2_2;
-
   django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
 
   django_modelcluster = callPackage ../development/python-modules/django_modelcluster { };
@@ -1706,8 +1708,6 @@ in {
 
   django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
 
-  django = self.django_lts;
-
   django-sesame = callPackage ../development/python-modules/django-sesame { };
 
   django_silk = callPackage ../development/python-modules/django_silk { };