From c8c68e50a5ea392c3ae3f59994275f7f08cfa7d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 13:54:53 +0000 Subject: [PATCH 1/2] python310Packages.folium: 0.15.0 -> 0.15.1 --- pkgs/development/python-modules/folium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8b29b61fe698..f46220cd7fef 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.15.0"; + version = "0.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; + hash = "sha256-CHPHxp8xEZhEEMLvhs/xAiOr2Hw6B+5svFNY+QvQa+U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,6 +41,7 @@ buildPythonPackage rec { jinja2 numpy requests + xyzservices ]; nativeCheckInputs = [ @@ -50,7 +51,6 @@ buildPythonPackage rec { pillow pytestCheckHook selenium - xyzservices ]; disabledTests = [ From eb5760d61f83df3f75109c74ee275311a59c9bb3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 20 Dec 2023 10:31:53 +0900 Subject: [PATCH 2/2] python311Packages.folium: switch to pypa build --- pkgs/development/python-modules/folium/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index f46220cd7fef..d5384fc221c6 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -12,14 +12,16 @@ , pythonOlder , requests , selenium +, setuptools , setuptools-scm +, wheel , xyzservices }: buildPythonPackage rec { pname = "folium"; version = "0.15.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +35,9 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [