diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-12-30 15:30:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 15:30:05 +0000 |
| commit | 9d4de1eac81e58f45727a069811bc7fb9b07177d (patch) | |
| tree | e3409ea9c3426a41a52652cfe5d67b7f71682710 | |
| parent | 9ee22e24b35e46911bb8000c61b84c880b525795 (diff) | |
| parent | f85da5ac6c83173ee7e34ccbee3863bd1cdf1a3c (diff) | |
| download | nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar.gz nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar.bz2 nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar.lz nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar.xz nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.tar.zst nixlib-9d4de1eac81e58f45727a069811bc7fb9b07177d.zip | |
Merge pull request #32852 from georgewhewell/django-2_0
django: add 2.0 release
| -rw-r--r-- | pkgs/development/python-modules/django/2_0.nix | 44 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix new file mode 100644 index 000000000000..990460ade55a --- /dev/null +++ b/pkgs/development/python-modules/django/2_0.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + name = "${pname}-${version}"; + version = "2.0"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0iqzqd1jrc4gg5qygxxzbddc8xzk85j0gikk5g9wpy3z98fqa54n"; + }; + + 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 74b179e1e779..0b837c5eeafe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7472,6 +7472,10 @@ in { gdal = self.gdal; }; + django_2_0 = callPackage ../development/python-modules/django/2_0.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; |