Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 11 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/haversine/default.nix b/nixpkgs/pkgs/development/python-modules/haversine/default.nix
index 328af63b6e9e..68f3940a382b 100644
--- a/nixpkgs/pkgs/development/python-modules/haversine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/haversine/default.nix
@@ -4,22 +4,27 @@
 , numpy
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "haversine";
-  version = "2.8.0";
-  format = "setuptools";
+  version = "2.8.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "mapado";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-cwvTs/91eJhjmeuCQAUBgfnKuCiLEg1jSnrXfx9VWkI=";
+    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 ];
   };