diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pyosmium/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/pyosmium/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 40090532fea1..08599707498e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , cmake , libosmium , protozero @@ -10,17 +9,19 @@ , bzip2 , zlib , pybind11 -, shapely , pythonOlder +, pytest-httpserver +, pytestCheckHook +, shapely +, werkzeug , isPyPy , lz4 , requests -, pytestCheckHook }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -29,17 +30,9 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; + hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; }; - patches = [ - # Compatibility with recent pybind versions - (fetchpatch { - url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch"; - hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag="; - }) - ]; - nativeBuildInputs = [ cmake ]; @@ -64,6 +57,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook shapely + werkzeug + pytest-httpserver ]; meta = with lib; { |