From 2f1d85fa7318af9a28dd6fd7b9867af595a3138e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 18:59:54 +0000 Subject: [PATCH 1/2] python312Packages.pyosmium: 3.7.0 -> 4.0.0 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 664054df075b..abf2bbf698fe 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.7.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; + hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I="; }; nativeBuildInputs = [ cmake ]; From dca59258343eb3da0da1c42a743dc644a9ff85ee Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 21 Sep 2024 00:24:32 +0400 Subject: [PATCH 2/2] python312Packages.pyosmium: modernize --- .../python-modules/pyosmium/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index abf2bbf698fe..fabca6700316 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -13,6 +13,7 @@ pythonOlder, pytest-httpserver, pytestCheckHook, + setuptools, shapely, werkzeug, isPyPy, @@ -23,17 +24,19 @@ buildPythonPackage rec { pname = "pyosmium"; version = "4.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; - repo = pname; + repo = "pyosmium"; rev = "refs/tags/v${version}"; hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -47,7 +50,7 @@ buildPythonPackage rec { lz4 ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; preBuild = "cd .."; @@ -58,11 +61,13 @@ buildPythonPackage rec { pytest-httpserver ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; }; }