From 11f9033305c6f88dcd1e24688159f0245bd36096 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Tue, 27 Oct 2020 22:28:41 +0100 Subject: [PATCH] python3.pkgs.pyosmium: 2.15.3 -> 3.0.1 --- pkgs/development/python-modules/pyosmium/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index e63fd00bb57..ffcd3569e0a 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,16 +1,18 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, mock, isPy3k }: +, nose, shapely, pythonOlder, isPyPy }: buildPythonPackage rec { pname = "pyosmium"; - version = "2.15.3"; + version = "3.0.1"; + + disabled = pythonOlder "3.4" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "1523ym9i4rnwi5kcp7n2lm67kxlhar8xlv91s394ixzwax9bgg7w"; + sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +20,7 @@ buildPythonPackage rec { preBuild = "cd .."; - checkInputs = [ nose shapely ] ++ lib.optionals (!isPy3k) [ mock ]; + checkInputs = [ nose shapely ]; checkPhase = "(cd test && ${python.interpreter} run_tests.py)";