diff options
author | Lancelot SIX <lsix@lancelotsix.com> | 2020-01-21 14:00:54 +0100 |
---|---|---|
committer | Lancelot SIX <lsix@lancelotsix.com> | 2020-01-21 14:00:54 +0100 |
commit | 1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8 (patch) | |
tree | 7be52f3fed413e1adef4d770c48f3783a0f40b3e | |
parent | ab10bac1b177832b5e6b883ba95bf35f87229267 (diff) | |
download | nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar.gz nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar.bz2 nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar.lz nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar.xz nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.tar.zst nixpkgs-1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8.zip |
pythonPackages.django_2_1: drop
Django-2.1 support ended on December 2, 2019, so drop it in nixpkgs as well.
-rw-r--r-- | pkgs/applications/office/paperless/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/django/2_1.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 1 insertions, 43 deletions
diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 97088f36041..1383986cf2e 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -116,7 +116,7 @@ let }; }; - django_2_0 = pyPkgs: pyPkgs.django_2_1.overrideDerivation (_: rec { + django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec { pname = "Django"; version = "2.0.12"; name = "${pname}-${version}"; diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix deleted file mode 100644 index 19e8b0c1a75..00000000000 --- a/pkgs/development/python-modules/django/2_1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "2.1.15"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - 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 098d3b19eee..8a5c4a18f36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3187,10 +3187,6 @@ in { gdal = self.gdal; }; - django_2_1 = callPackage ../development/python-modules/django/2_1.nix { - gdal = self.gdal; - }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; |