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

Conflicts:
	nixpkgs/pkgs/servers/pr-tracker/default.nix

1 files changed, 5 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix
index e63ecdc66690..f4121a53e794 100644
--- a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix
@@ -7,13 +7,13 @@
 , pyyaml
 , requests
 , responses
-, setuptools-scm
+, poetry-core
 }:
 
 buildPythonPackage rec {
   pname = "pysolcast";
-  version = "1.0.15";
-  format = "setuptools";
+  version = "2.0.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -21,13 +21,11 @@ buildPythonPackage rec {
     owner = "mcaulifn";
     repo = "solcast";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CvijYl6zSwQ6BrGZPJWp75jAApc2y/7cPdZxMq5AjmI=";
+    hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo=";
   };
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   nativeBuildInputs = [
-    setuptools-scm
+    poetry-core
   ];
 
   propagatedBuildInputs = [
@@ -41,11 +39,6 @@ buildPythonPackage rec {
     responses
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "pytest-runner" ""
-  '';
-
   pythonImportsCheck = [
     "pysolcast"
   ];