From af8a48c3c12fc731f96eaa85a4531bea013d13c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Oct 2020 13:41:51 +0100 Subject: [PATCH] Revert "pythonPackages.django: clarify versions, remove django_lts attribute" Fix eval. This reverts commit 00d5a1332234de8f0b8ac947f06a025689894e8c. --- pkgs/development/python-modules/django/{2.nix => 2_2.nix} | 0 pkgs/top-level/python-packages.nix | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/django/{2.nix => 2_2.nix} (100%) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2_2.nix similarity index 100% rename from pkgs/development/python-modules/django/2.nix rename to pkgs/development/python-modules/django/2_2.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aca07da615..26347eed8e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1597,12 +1597,8 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django = self.django_2; + django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; - # 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 { }; @@ -1710,6 +1706,8 @@ 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 { };