From 54568a1bea064634759e89e46b54c15854188015 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:46:45 +0200 Subject: [PATCH] pythonPackages.django_1_11: no longer supported --- .../python-modules/django/1_11.nix | 34 ------------------- pkgs/top-level/python-packages.nix | 8 +---- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/django/1_11.nix diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix deleted file mode 100644 index b38962f4efa..00000000000 --- a/pkgs/development/python-modules/django/1_11.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.11.28"; - - src = fetchurl { - url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index caf8f0f0358..3a2ac3d52d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2894,9 +2894,7 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; - debugpy = callPackage ../development/python-modules/debugpy { - django = if isPy27 then self.django_1_11 else self.django; - }; + debugpy = callPackage ../development/python-modules/debugpy { }; decorator = callPackage ../development/python-modules/decorator { }; @@ -3756,10 +3754,6 @@ in { django_lts = self.django_2_2; - django_1_11 = callPackage ../development/python-modules/django/1_11.nix { - gdal = self.gdal; - }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { };