JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "pythonPackages.django: clarify versions, remove django_lts attribute""

Browse Source 
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 af8a48c3c1.
This commit is contained in:
Frederik Rietdijk 2020-10-25 13:49:32 +01:00
parent af8a48c3c1
commit 89a60382e4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/paperless/python-modules/default.nix
View File

@ -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;

4
pkgs/development/python-modules/django-oauth-toolkit/default.nix
View File

@ -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;

0
pkgs/development/python-modules/django/2_2.nix → pkgs/development/python-modules/django/2.nix
View File

10
pkgs/top-level/python-packages.nix
View File

@ -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 { };