From 2798da019f45693e1f90628135894485dbd42ff1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 22 Aug 2019 14:51:59 +0200 Subject: [PATCH 1/2] pythonPackages.pyowm: disable python2 - Python2 support has been deprecated in 2.9 (https://github.com/csparpa/pyowm/releases/tag/2.9.0) - Python-3.3 support dropped in 2.10 (https://github.com/csparpa/pyowm/releases/tag/2.10) --- pkgs/development/python-modules/pyowm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 1392956ef036..37d4f51fa1f5 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, requests, geojson }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, requests, geojson }: buildPythonPackage rec { pname = "pyowm"; version = "2.10.0"; + disabled = pythonOlder "3.3"; + src = fetchPypi { inherit pname version; sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; From c15aff9fa435087cea94970957f35d05d46f9270 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 22 Aug 2019 14:53:50 +0200 Subject: [PATCH 2/2] python3Packages.pyowm: drop outdated patching Version 2.10 relaxed the requirement for geojson from `geojson>=2.3.0,<2.4` to `geojson>=2.3.0,<3`. Remove the postPatch hook that adjusted this requirement when it broke in nixpkgs. --- pkgs/development/python-modules/pyowm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 37d4f51fa1f5..1b8fffa1d294 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -16,8 +16,7 @@ buildPythonPackage rec { # This may actually break the package. postPatch = '' substituteInPlace setup.py \ - --replace "requests>=2.18.2,<2.19" "requests" \ - --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0" + --replace "requests>=2.18.2,<2.19" "requests" ''; # No tests in archive