about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2019-02-10 01:58:35 +0000
committerGitHub <noreply@github.com>2019-02-10 01:58:35 +0000
commit06b1f8fbe677be33ae601a5e417f77d0dbff39b1 (patch)
treec04f465d4749f3512b1f9cfa1a2df91591179e5d
parent59cd3ee8950e8589a6c46fa216578c3cfa70699a (diff)
parent8cf4803d5e4aa6c6b937a23d55c7b7822150d9be (diff)
downloadnixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar.gz
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar.bz2
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar.lz
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar.xz
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.tar.zst
nixlib-06b1f8fbe677be33ae601a5e417f77d0dbff39b1.zip
Merge pull request #55484 from refnil/54943-remove-django-2.0
Remove django 2.0
-rw-r--r--pkgs/development/python-modules/django/2_0.nix43
-rw-r--r--pkgs/top-level/python-packages.nix4
2 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
deleted file mode 100644
index daabcefb6e92..000000000000
--- a/pkgs/development/python-modules/django/2_0.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll,
-  isPy3k,
-  geos, gdal, pytz,
-  withGdal ? false
-}:
-
-buildPythonPackage rec {
-  pname = "Django";
-  version = "2.0.10";
-
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23";
-  };
-
-  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 7cc5e187764e..ea3e4261293e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2236,10 +2236,6 @@ in {
     gdal = self.gdal;
   };
 
-  django_2_0 = callPackage ../development/python-modules/django/2_0.nix {
-    gdal = self.gdal;
-  };
-
   django_2_1 = callPackage ../development/python-modules/django/2_1.nix {
     gdal = self.gdal;
   };