From 5f758a692e686b3861d04cb9afb1ce614ce3489e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:00:06 +0100 Subject: [PATCH 1/2] python311Packages.haversine: 2.8.0 -> 2.8.1 Diff: https://github.com/mapado/haversine/compare/v2.8.0...v2.8.1 --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 328af63b6e9e..a0cb21ad2aa4 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mapado"; repo = pname; rev = "v${version}"; - hash = "sha256-cwvTs/91eJhjmeuCQAUBgfnKuCiLEg1jSnrXfx9VWkI="; + hash = "sha256-MKOg2awpamupvuXstiH7VoIY4ax+hy2h2cFXDFKJ2mA="; }; nativeCheckInputs = [ From 18ea65b9b7615b7044d8ce9cd86ac2df66ffa64e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:02:33 +0100 Subject: [PATCH 2/2] python311Packages.haversine: refactor --- .../development/python-modules/haversine/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index a0cb21ad2aa4..68f3940a382b 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -4,22 +4,27 @@ , numpy , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "haversine"; version = "2.8.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mapado"; - repo = pname; - rev = "v${version}"; + repo = "haversine"; + rev = "refs/tags/v${version}"; hash = "sha256-MKOg2awpamupvuXstiH7VoIY4ax+hy2h2cFXDFKJ2mA="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ numpy pytestCheckHook @@ -32,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module the distance between 2 points on earth"; homepage = "https://github.com/mapado/haversine"; + changelog = "https://github.com/mapado/haversine/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; };