Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions pkgs/development/python-modules/pyosmium/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, cmake
, libosmium
, protozero
Expand All @@ -10,12 +9,14 @@
, bzip2
, zlib
, pybind11
, shapely
, pythonOlder
, pytest-httpserver
, pytestCheckHook
, shapely
, werkzeug
, isPyPy
, lz4
, requests
, pytestCheckHook
}:

buildPythonPackage rec {
Expand All @@ -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
];
Expand All @@ -64,6 +57,8 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
shapely
werkzeug
pytest-httpserver
];

meta = with lib; {
Expand Down