gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #281389 from mattfawcett/fix-pyosmium

Browse Source 
pythonPackages.pyosmium: fix build
This commit is contained in:
Nikolay Korotkiy
2024-01-17 16:02:43 +04:00
committed by GitHub
parent 89e1466501 0351ba003f
commit 970334455b
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/python-modules/pyosmium/default.nix
View File

@@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, libosmium , libosmium
, protozero , protozero
@@ -10,12 +9,14 @@
, bzip2 , bzip2
, zlib , zlib
, pybind11 , pybind11
, shapely
, pythonOlder , pythonOlder
, pytest-httpserver
, pytestCheckHook
, shapely
, werkzeug
, isPyPy , isPyPy
, lz4 , lz4
, requests , requests
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@@ -32,14 +33,6 @@ buildPythonPackage rec {
hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; 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 = [ nativeBuildInputs = [
cmake cmake
]; ];
@@ -64,6 +57,8 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
shapely shapely
werkzeug
pytest-httpserver
]; ];
meta = with lib; { meta = with lib; {