From bd0811166cdaaa199e40ae6ec433f2c128158c7f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Jun 2017 13:07:23 +0200 Subject: [PATCH 1/5] python.pkgs.django_1_9: remove Old version, so removing. https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 --- pkgs/top-level/python-packages.nix | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a3b424780b9..b927222c6e08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4821,7 +4821,7 @@ in { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; }; - buildInputs = with self; [ pyramid_mako nose django_1_9 jinja2 tornado pyramid Mako ]; + buildInputs = with self; [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; propagatedBuildInputs = with self; [ six ]; patchPhase = '' sed -i 's/1.4.99/1.99/' setup.py @@ -9810,30 +9810,6 @@ in { gdal = self.gdal; }; - django_1_9 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.9.13"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "079zspfsvfnv9wf6qvg8xmz1m23d0723p2nqyk8gfqb012jxn1y0"; - }; - - # 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/; - }; - }; - django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -28701,7 +28677,7 @@ EOF disabled = isPyPy; # Wants to set up Django doCheck = false; - propagatedBuildInputs = with self; [ django_1_9 smartypants jinja2 ]; + propagatedBuildInputs = with self; [ django smartypants jinja2 ]; meta = { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; From 6bcf106b6564f246f7c226b05230ce39ed771374 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Jun 2017 13:08:55 +0200 Subject: [PATCH 2/5] python.pkgs.django_1_6: remove Old version, so removing. https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 --- pkgs/top-level/python-packages.nix | 42 ++++++------------------------ 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b927222c6e08..0591e6251b4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9834,32 +9834,6 @@ in { }; }; - django_1_6 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.6.11.5"; - - # Support to python-3.4 and higher was introduced in django_1_7 - disabled = !(isPy26 || isPy27 || isPy33); - - src = pkgs.fetchurl { - url = "https://downloads.reviewboard.org/releases/Django/1.6/Django-${version}.tar.gz"; - sha256 = "0yj0fw3iql031z8l5ik1fb25sk3l5bw2vc63bbyg5rz2k3znl4il"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_appconf = buildPythonPackage rec { name = "django-appconf-${version}"; version = "1.0.1"; @@ -9957,7 +9931,7 @@ in { sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -9993,7 +9967,7 @@ in { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -10195,7 +10169,7 @@ in { sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; }; - propagatedBuildInputs = with self; [ django_1_6 futures ]; + propagatedBuildInputs = with self; [ django futures ]; meta = with stdenv.lib; { description = "Pipeline is an asset packaging library for Django"; @@ -10222,7 +10196,7 @@ in { }; propagatedBuildInputs = with self; [ - django_1_6 feedparser django_pipeline_1_3 pillowfight pytz ]; + django feedparser django_pipeline_1_3 pillowfight pytz ]; meta = { description = "A collection of useful extensions for Django"; @@ -13644,7 +13618,7 @@ in { buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ - django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 + django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow ]; @@ -21368,7 +21342,7 @@ in { buildInputs = with self; [ coverage mock nose geopy ]; propagatedBuildInputs = with self; [ - django_1_6 dateutil_1_5 whoosh pysolr elasticsearch + django dateutil_1_5 whoosh pysolr elasticsearch ]; patchPhase = '' @@ -21453,7 +21427,7 @@ in { ''; propagatedBuildInputs = with self; - [ django_1_6 recaptcha_client pytz memcached dateutil_1_5 paramiko flup + [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto pysvn pillow psycopg2 django-haystack python_mimeparse markdown django-multiselectfield ]; @@ -27298,7 +27272,7 @@ EOF sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_6 django_tagging_0_3 whisper pycairo ldap memcached pytz ]; + propagatedBuildInputs = with self; [ django django_tagging_0_3 whisper pycairo ldap memcached pytz ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ From d25c87c36d9e6a265de985f37c7cf611a8184951 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Jun 2017 13:13:59 +0200 Subject: [PATCH 3/5] python.pkgs: do not pin django version instead, override the package set and set `django = super.django_1_8`. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0591e6251b4c..ac8dc25e8235 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13480,7 +13480,7 @@ in { propagatedBuildInputs = with self; [ cython sympy - django_1_8 + django ply mpmath dateutil From 01e19386f7ed01ef4aef3e142da857def2c8d5be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Jun 2017 13:14:28 +0200 Subject: [PATCH 4/5] python.pkgs.django_1_10: will be dropped before 17.09 --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac8dc25e8235..3799e9b09874 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9806,6 +9806,9 @@ 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; }; From 70e169460acdac22481a65a4e440b1967e4abdd0 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 7 Jun 2017 23:30:33 +0200 Subject: [PATCH 5/5] pythonPackages: mark disabled and broken packages --- pkgs/top-level/python-packages.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3799e9b09874..0759625a84b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10190,7 +10190,10 @@ in { }); - djblets = buildPythonPackage rec { + djblets = if (versionOlder self.django.version "1.6.11") || + (versionAtLeast self.django.version "1.9") + then throw "djblets only suported for Django<1.8.999,>=1.6.11" + else buildPythonPackage rec { name = "Djblets-0.9"; src = pkgs.fetchurl { @@ -13457,7 +13460,10 @@ in { }; }; - mathics = buildPythonPackage rec { + mathics = if (versionOlder self.django.version "1.8") || + (versionAtLeast self.django.version "1.9") + then throw "mathics only supports django-1.8.x" + else buildPythonPackage rec { name = "mathics-${version}"; version = "0.9"; src = pkgs.fetchFromGitHub {