From 00d5a1332234de8f0b8ac947f06a025689894e8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 Aug 2020 17:01:09 +0200 Subject: [PATCH] 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/ --- pkgs/development/python-modules/django/{2_2.nix => 2.nix} | 0 pkgs/top-level/python-packages.nix | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) 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 cf6b4235090..b501610df18 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 { }; @@ -1706,8 +1710,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 { };