Merge pull request #476 from imincik/weekly-update-2024.16

pkgs: weekly update (weekly-update-2024.16)

pkgs/geos/default.nix

@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
+  # https://github.com/libgeos/geos/issues/930
+  cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope"
+  ];
+
   doCheck = true;
 
   passthru.tests = {

pkgs/postgis/nixpkgs/maintainers.patch

@@ -0,0 +1,13 @@
+diff --git a/pkgs/postgis/postgis.nix b/pkgs/postgis/postgis.nix
+index 6f25390..1a50583 100644
+--- a/pkgs/postgis/postgis.nix
++++ b/pkgs/postgis/postgis.nix
+@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
+     homepage = "https://postgis.net/";
+     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
+     license = licenses.gpl2;
+-    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ];
++    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ];
+     inherit (postgresql.meta) platforms;
+     broken = versionOlder postgresql.version "12";
+   };

pkgs/rasterio/default.nix

@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , pytestCheckHook
 , pythonOlder
 , stdenv
@@ -20,7 +19,6 @@
 , ipython
 , matplotlib
 , numpy
-, oldest-supported-numpy
 , packaging
 , pytest-randomly
 , setuptools
@@ -33,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.3.9";
+  version = "1.3.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -42,32 +40,23 @@ buildPythonPackage rec {
     owner = "rasterio";
     repo = "rasterio";
     rev = "refs/tags/${version}";
-    hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
+    hash = "sha256-FidUaSpbTR8X1/Cqy/IwApkOOl2RRtPqYJaSISRPThI=";
   };
 
-  patches = [
-    # fix tests failing with GDAL 3.8.0
-    (fetchpatch {
-      url = "https://github.com/rasterio/rasterio/commit/54ec554a6d9ee52207ad17dee42cbc51c613f709.diff";
-      hash = "sha256-Vjt9HRYNAWyj0myMdtSUENbcLjACfzegEClzZb4BxY8=";
-    })
-    (fetchpatch {
-      url = "https://github.com/rasterio/rasterio/commit/5a72613c58d1482bf297d08cbacf27992f52b2c4.diff";
-      hash = "sha256-bV6rh3GBmeqq9+Jff2b8/1wOuyF3Iqducu2eN4CT3lM=";
-    })
-  ];
-
   postPatch = ''
     # remove useless import statement requiring distutils to be present at the runtime
     substituteInPlace rasterio/rio/calc.py \
       --replace "from distutils.version import LooseVersion" ""
+
+    # relax dependency on yet non-packaged, RC version of numpy
+    substituteInPlace pyproject.toml \
+      --replace "numpy==2.0.0rc1" "numpy"
     '';
 
   nativeBuildInputs = [
     cython_3
     gdal
     numpy
-    oldest-supported-numpy
     setuptools
     wheel
   ];
@@ -104,12 +93,6 @@ buildPythonPackage rec {
     shapely
   ];
 
-  # rio has runtime dependency on setuptools
-  setuptoolsPythonPath = [ setuptools ];
-  postInstall = ''
-    wrapPythonProgramsIn "$out/bin" "$out $setuptoolsPythonPath"
-  '';
-
   doCheck = true;
 
   preCheck = ''
@@ -118,9 +101,6 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     "-m 'not network'"
-
-    # pytest.PytestRemovedIn8Warning: Passing None has been deprecated.
-    "-W ignore::pytest.PytestRemovedIn8Warning"
   ];
 
   disabledTests = [

pkgs/rasterio/nixpkgs/replace.patch

@@ -1,13 +1,18 @@
 diff --git a/pkgs/rasterio/default.nix b/pkgs/rasterio/default.nix
-index 07dfa2c..5282e0f 100644
+index 20eb3df..150fe76 100644
 --- a/pkgs/rasterio/default.nix
 +++ b/pkgs/rasterio/default.nix
-@@ -60,7 +60,7 @@ buildPythonPackage rec {
+@@ -46,11 +46,11 @@ buildPythonPackage rec {
    postPatch = ''
      # remove useless import statement requiring distutils to be present at the runtime
      substituteInPlace rasterio/rio/calc.py \
 -      --replace-fail "from distutils.version import LooseVersion" ""
 +      --replace "from distutils.version import LooseVersion" ""
+
+     # relax dependency on yet non-packaged, RC version of numpy
+     substituteInPlace pyproject.toml \
+-      --replace-fail "numpy==2.0.0rc1" "numpy"
++      --replace "numpy==2.0.0rc1" "numpy"
      '';
 
    nativeBuildInputs = [

pkgs/shapely/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "shapely";
-  version = "2.0.3";
+  version = "2.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TWXQqnkQr3Hvpy/WRH4CqOXdRNqBqYPenXNtbmzL5nQ=";
+    hash = "sha256-Xcc2En+scACbjTCaDut08+CJeeUwz3AX8vUH72Lmz7g=";
   };
 
   nativeBuildInputs = [