From 128430cd3ea900111c1ad4af6b3152aabcb3e038 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 27 Jul 2017 11:21:48 +0200 Subject: [PATCH] pythonPackages.django_1_10: drop Drop django_1_10 ahead of `release-17.09`[1] branch off. Django-1.10 will not be maintained for the entire lifetime of 17.09 so only the 1.8 and 1.11 branches are maintained (both are LTS versions[2]). [1] https://groups.google.com/forum/#!topic/nix-devel/vILGXXbeCPg [2] https://www.djangoproject.com/download/ --- .../python-modules/django/1_10.nix | 36 ------------------- pkgs/top-level/python-packages.nix | 7 ---- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/python-modules/django/1_10.nix diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix deleted file mode 100644 index 52b62e8d8b8..00000000000 --- a/pkgs/development/python-modules/django/1_10.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - pythonOlder, - geos, gdal -}: -buildPythonPackage rec { - pname = "Django"; - name = "${pname}-${version}"; - version = "1.10.7"; - disabled = pythonOlder "2.7"; - - src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar"; - }; - - patches = [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - }) - ]; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - # too complicated to setup - doCheck = false; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a817b75292..8f0d061ed1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9343,13 +9343,6 @@ in { gdal = self.gdal; }; - # TODO: Django 1.10 will be maintained until the end of the year. Therefore, - # it will be dropped before 17.09. - # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 - django_1_10 = callPackage ../development/python-modules/django/1_10.nix { - gdal = self.gdal; - }; - django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18";