Merge pull request #477 from imincik/weekly-update-2024.17

pkgs: weekly update (weekly-update-2024.17)

DEVELOPMENT.md

@@ -67,7 +67,7 @@ nix why-depends .#<PACKAGE> .#<DEPENDENCY>
 
 ### Packages update process
 
-* Checkout to `weekly-update` PR (PR title "pkgs: weekly update (<DATE>)") (Thursday - Friday)
+* Checkout to `weekly-update` PR (PR title "pkgs: weekly update (weekly-update-<DATE>)") (Thursday - Friday)
 ```bash
 gh pr checkout -f <PR-NUMBER>
 ```
@@ -78,6 +78,9 @@ utils/pull-nixpkgs.sh <NIXPKGS-DIR>
 ```
 
 * Visually review changes created by `pull-nixpkgs.sh` script
+```
+git diff
+```
 
 * Identify related PRs in Nixpkgs
 ```

pkgs/fiona/nixpkgs/cython.patch

@@ -0,0 +1,22 @@
+diff --git b/pkgs/fiona/default.nix a/pkgs/fiona/default.nix
+index 35c9b57..e198752 100644
+--- b/pkgs/fiona/default.nix
++++ a/pkgs/fiona/default.nix
+@@ -2,7 +2,7 @@
+ , buildPythonPackage
+ , pythonOlder
+ , fetchFromGitHub
+-, cython
++, cython_3
+ , gdal
+ , oldest-supported-numpy
+ , setuptools
+@@ -34,7 +34,7 @@ buildPythonPackage rec {
+   };
+
+   nativeBuildInputs = [
+-    cython
++    cython_3
+     gdal # for gdal-config
+     oldest-supported-numpy
+     setuptools

pkgs/qgis/unwrapped-ltr.nix

@@ -73,14 +73,14 @@ let
     urllib3
   ];
 in mkDerivation rec {
-  version = "3.34.5";
+  version = "3.34.6";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-TRSS1YclGUfBjNz+Lo8U8YlN4kdJ9JLcwd7qpgwRbG0=";
+    hash = "sha256-eWd8oIINWVN5Dt6s4bc1RtQbytFd0foPgIcd/N2hsMw=";
   };
 
   passthru = {

pkgs/qgis/unwrapped.nix

@@ -73,14 +73,14 @@ let
     urllib3
   ];
 in mkDerivation rec {
-  version = "3.36.1";
+  version = "3.36.2";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-/0wVPcQoliJFgY8Kn506gUHfY+kDTdLgzbp/0KLSAkI=";
+    hash = "sha256-/8mpzl/6UpjrMVjae2nqpS2DBRCq86rE+B3INzoRz8g=";
   };
 
   passthru = {

pkgs/rasterio/nixpkgs/cython.patch

@@ -0,0 +1,22 @@
+diff --git b/pkgs/rasterio/default.nix a/pkgs/rasterio/default.nix
+index abf2de3..150fe76 100644
+--- b/pkgs/rasterio/default.nix
++++ a/pkgs/rasterio/default.nix
+@@ -13,7 +13,7 @@
+ , click
+ , click-plugins
+ , cligj
+-, cython
++, cython_3
+ , gdal
+ , hypothesis
+ , ipython
+@@ -54,7 +54,7 @@ buildPythonPackage rec {
+     '';
+
+   nativeBuildInputs = [
+-    cython
++    cython_3
+     gdal
+     numpy
+     setuptools

pkgs/shapely/nixpkgs/cython.patch

@@ -0,0 +1,22 @@
+diff --git b/pkgs/shapely/default.nix a/pkgs/shapely/default.nix
+index 28f2acd..209cdf3 100644
+--- b/pkgs/shapely/default.nix
++++ a/pkgs/shapely/default.nix
+@@ -5,7 +5,7 @@
+ , pytestCheckHook
+ , pythonOlder
+
+-, cython_0
++, cython
+ , geos
+ , numpy
+ , oldest-supported-numpy
+@@ -26,7 +26,7 @@ buildPythonPackage rec {
+   };
+
+   nativeBuildInputs = [
+-    cython_0
++    cython
+     geos # for geos-config
+     oldest-supported-numpy
+     setuptools