Merge pull request NixOS#262886 from GaetanLepage/fiona

python311Packages.fiona: 1.9.4.post1 -> 1.9.5

pkgs/development/python-modules/fiona/default.nix

@@ -2,8 +2,9 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, cython
+, cython_3
 , gdal
+, oldest-supported-numpy
 , setuptools
 , wheel
 , attrs
@@ -20,30 +21,22 @@
 
 buildPythonPackage rec {
   pname = "fiona";
-  version = "1.9.4.post1";
-  format = "pyproject";
+  version = "1.9.5";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "Fiona";
     rev = "refs/tags/${version}";
-    hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw=";
+    hash = "sha256-fq/BuyzuK4iOxdpE4h+KRH0CxOEk/wdmbb9KgCfJ1cw=";
   };
 
-  postPatch = ''
-    # Remove after https://github.com/Toblerity/Fiona/pull/1225 is released
-    sed -i '/"oldest-supported-numpy"/d' pyproject.toml
-
-    # Remove after https://github.com/Toblerity/Fiona/pull/1281 is released,
-    # after which cython also needs to be updated to cython_3
-    sed -i 's/Cython~=/Cython>=/' pyproject.toml
-  '';
-
   nativeBuildInputs = [
-    cython
+    cython_3
     gdal # for gdal-config
+    oldest-supported-numpy
     setuptools
     wheel
   ];

pkgs/development/python-modules/scikit-misc/default.nix

@@ -1,6 +1,6 @@
 { lib
-, fetchPypi
 , buildPythonPackage
+, fetchFromGitHub
 , cython
 , gfortran
 , git
@@ -15,12 +15,13 @@
 buildPythonPackage rec {
   pname = "scikit-misc";
   version = "0.3.0";
-  format = "pyproject";
+  pyproject = true;
 
-  src = fetchPypi {
-    pname = "scikit_misc";
-    inherit version;
-    hash = "sha256-mom0Ch+b3bViErh9ueVYiGfVz5SQUSqCCcGsBJ7+Nrg=";
+  src = fetchFromGitHub {
+    owner = "has2k1";
+    repo = "scikit-misc";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s=";
   };
 
   postPatch = ''