diff options
author | Lancelot SIX <lsix+github@lancelotsix.com> | 2018-08-24 11:04:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-24 11:04:48 +0200 |
commit | 8b9444a0fbb32deef6391b953529c85148f60f4a (patch) | |
tree | de0caabe111c7d52fcf0bd536585be9cf4189e96 /pkgs/development/python-modules | |
parent | 084078dd3999b19f49a0395a05804d1085ade5f7 (diff) | |
parent | 7a72c4da1b5dae83d006f01d5a38d1542f15704c (diff) | |
download | nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar.gz nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar.bz2 nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar.lz nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar.xz nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.tar.zst nixlib-8b9444a0fbb32deef6391b953529c85148f60f4a.zip |
Merge pull request #45116 from lsix/update_django
pythonPackages.django: update django_2_0 and add django_2_1
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/django/1_11.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/django/2_0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/django/2_1.nix | 43 |
3 files changed, 47 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ada73a7e8180..ba65297dbb9c 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 [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 3c35b74bab61..0bfe43a20e18 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 [ 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 000000000000..f63822f363ab --- /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 ]; + }; +} |