From 0351ba003f4933edb3035edff0a798a2a4290152 Mon Sep 17 00:00:00 2001 From: Matt Fawcett Date: Tue, 16 Jan 2024 19:55:04 +0000 Subject: [PATCH] pythonPackages.pyosmium: fix build The patch is already included in version 3.7.0 https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69 Also fix test dependencies --- .../python-modules/pyosmium/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index d35b5d7241b6..08599707498e 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , cmake , libosmium , protozero @@ -10,12 +9,14 @@ , bzip2 , zlib , pybind11 -, shapely , pythonOlder +, pytest-httpserver +, pytestCheckHook +, shapely +, werkzeug , isPyPy , lz4 , requests -, pytestCheckHook }: buildPythonPackage rec { @@ -32,14 +33,6 @@ buildPythonPackage rec { 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; {