From ff3aeada34f6a3000746e0e4d1ab6a3dd7de59a2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 16 Aug 2018 17:47:35 +0200 Subject: [PATCH 1/3] pythonPackages.django_2_0: 2.0.7 -> 2.0.8 --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 3c35b74bab6..0bfe43a20e1 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.7"; + version = "2.0.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613"; + sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8"; }; patches = stdenv.lib.optionals withGdal [ From 08a32ae34fac8a81536c47778d28d7d0e6c92324 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 16 Aug 2018 17:48:30 +0200 Subject: [PATCH 2/3] pythonPakcages.django_2_1: init at 2.1 --- .../development/python-modules/django/2_1.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/django/2_1.nix diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix new file mode 100644 index 00000000000..f63822f363a --- /dev/null +++ b/pkgs/development/python-modules/django/2_1.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z"; + }; + + patches = stdenv.lib.optionals withGdal [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + 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; + maintainers = with maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d..5f382901a55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4570,6 +4570,10 @@ in { gdal = self.gdal; }; + django_2_1 = callPackage ../development/python-modules/django/2_1.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; From 7a72c4da1b5dae83d006f01d5a38d1542f15704c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 21 Aug 2018 14:58:55 +0200 Subject: [PATCH 3/3] pythonPakcages.django: 1.11.13 -> 1.11.15 --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ada73a7e818..ba65297dbb9 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.13"; + version = "1.11.15"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6"; + sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi"; }; patches = stdenv.lib.optionals withGdal [