Merge pull request #45116 from lsix/update_django

pythonPackages.django: update django_2_0 and add django_2_1
This commit is contained in:
Lancelot SIX 2018-08-24 11:04:48 +02:00 committed by GitHub
commit 8b9444a0fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 4 deletions

View file

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

View file

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

View file

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

View file

@ -4581,6 +4581,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";