Merge pull request #524 from imincik/weekly-update-2024.36

pkgs: weekly update (weekly-update-2024.36)
imincik · Sep 6, 2024 · 77cdda9 · 77cdda9
2 parents 182977f + b7849b6
commit 77cdda9
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 89 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/fiona/default.nix b/pkgs/fiona/default.nix
@@ -1,67 +1,75 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   cython,
   gdal,
-  oldest-supported-numpy,
   setuptools,
-  wheel,
+
+  # dependencies
   attrs,
   certifi,
   click,
   click-plugins,
   cligj,
-  munch,
+
+  # optional-dependencies
+  pyparsing,
   shapely,
   boto3,
+
+  # tests
+  fsspec,
   pytestCheckHook,
   pytz,
+  snuggs,
 }:
 
 buildPythonPackage rec {
   pname = "fiona";
-  version = "1.9.6";
+  version = "1.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "Fiona";
     rev = "refs/tags/${version}";
-    hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM=";
+    hash = "sha256-0Jiyq9x9YLDN1a1LBlCK2ac6kLZ5X2rOPusUQH5OPrQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     gdal # for gdal-config
-    oldest-supported-numpy
     setuptools
-    wheel
   ];
 
   buildInputs = [ gdal ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     certifi
     click
-    cligj
     click-plugins
-    munch
+    cligj
   ];
 
-  passthru.optional-dependencies = {
-    calc = [ shapely ];
+  optional-dependencies = {
+    calc = [
+      pyparsing
+      shapely
+    ];
     s3 = [ boto3 ];
   };
 
   nativeCheckInputs = [
+    fsspec
     pytestCheckHook
     pytz
-  ] ++ passthru.optional-dependencies.s3;
+    shapely
+    snuggs
+  ] ++ optional-dependencies.s3;
 
   preCheck = ''
     rm -r fiona # prevent importing local fiona
@@ -87,12 +95,12 @@ buildPythonPackage rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt";
     description = "OGR's neat, nimble, no-nonsense API for Python";
     mainProgram = "fio";
     homepage = "https://fiona.readthedocs.io/";
-    license = licenses.bsd3;
-    maintainers = teams.geospatial.members;
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.geospatial.members;
   };
 }
diff --git a/pkgs/gdal/master-rev.nix b/pkgs/gdal/master-rev.nix
@@ -1,4 +1,4 @@
 {
-  rev = "a220d4a";
-  hash = "sha256-DAtjCKjA+ZJapiKzTU6gsXk/8dbfMJ1Lki7Wm3zOKb8=";
+  rev = "33dd00c";
+  hash = "sha256-HqSy7UzeYxYHjouIQ+NdwOoZk6AcAjztZ2ejuteSUaA=";
 }
diff --git a/pkgs/grass/plugins-rev.nix b/pkgs/grass/plugins-rev.nix
@@ -1,4 +1,4 @@
 {
-  rev = "fc565ea";
-  hash = "sha256-L+7AlGAHsykxP2HlUiX8sOP8GWtCGxKt6qQ55idP9x0=";
+  rev = "5762dd9";
+  hash = "sha256-8nJlm2WfcKQ5/eZln+stIJPn1xX0As25ZBMJcT+EGJU=";
 }
diff --git a/pkgs/qgis/default.nix b/pkgs/qgis/default.nix
@@ -24,13 +24,13 @@ symlinkJoin rec {
   pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs);
 
   postBuild = ''
-    # unpackPhase
-
     buildPythonPath "$pythonInputs"
 
-    wrapProgram $out/bin/qgis \
-      --prefix PATH : $program_PATH \
-      --set PYTHONPATH $program_PYTHONPATH
+    for program in $out/bin/*; do
+      wrapProgram $program \
+        --prefix PATH : $program_PATH \
+        --set PYTHONPATH $program_PYTHONPATH
+    done
   '';
 
   passthru = {

diff --git a/pkgs/qgis/ltr.nix b/pkgs/qgis/ltr.nix
@@ -24,13 +24,13 @@ symlinkJoin rec {
   pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs);
 
   postBuild = ''
-    # unpackPhase
-
     buildPythonPath "$pythonInputs"
 
-    wrapProgram $out/bin/qgis \
-      --prefix PATH : $program_PATH \
-      --set PYTHONPATH $program_PYTHONPATH
+    for program in $out/bin/*; do
+      wrapProgram $program \
+        --prefix PATH : $program_PATH \
+        --set PYTHONPATH $program_PYTHONPATH
+    done
   '';
 
   passthru = {

diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix
@@ -64,9 +64,9 @@
 
 
             Lizmap = {
-                version = "4.3.21";
-                url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.21/download/";
-                hash = "sha256-Z20ytfNPeZAXgJAmJOyaWY803uVWHp4fM3sOJL365Qs=";
+                version = "4.3.22";
+                url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.22/download/";
+                hash = "sha256-W5sPoR9UtMhsRAYS4k08KxB680MsgO0FnD8WGWoIhDM=";
             };
 
 
@@ -92,9 +92,9 @@
 
 
             Plugin-Reloader = {
-                version = "0.10";
-                url = "https://plugins.qgis.org/plugins/plugin_reloader/version/0.10/download/";
-                hash = "sha256-xcibvv4rBnRVDw2KwNJTa1QBi8cXVgrD6dcOEjkVia4=";
+                version = "0.11";
+                url = "https://plugins.qgis.org/plugins/plugin_reloader/version/0.11/download/";
+                hash = "sha256-MjqEwsmC5kLLYje2Li9YAVZOD3XjkwlpUmPhrHVNJYs=";
             };
 
 
@@ -113,9 +113,9 @@
 
 
             QGIS-Cloud-Plugin = {
-                version = "3.9.11";
-                url = "https://plugins.qgis.org/plugins/qgiscloud/version/3.9.11/download/";
-                hash = "sha256-luI9JbJ1XFk3fWDnNYZ2TVe0s9zV02Z99QvM20hF844=";
+                version = "3.9.12";
+                url = "https://plugins.qgis.org/plugins/qgiscloud/version/3.9.12/download/";
+                hash = "sha256-IrBVX7MEX6niOIzd+TCFCIKywHqiQbxo/g3LANP30uU=";
             };
 
 
@@ -308,6 +308,13 @@
             };
 
 
+            OpenQuake-Integrated-Risk-Modelling-Toolkit = {
+                version = "3.16.5";
+                url = "https://plugins.qgis.org/plugins/svir/version/3.16.5/download/";
+                hash = "sha256-yVb0J2aIug4bwkDNQPFZT3WbHYBdG8bMsI1l6X1XvW4=";
+            };
+
+
             NNJoin = {
                 version = "3.1.3";
                 url = "https://plugins.qgis.org/plugins/NNJoin/version/3.1.3/download/";
@@ -456,9 +463,9 @@
 
 
             Lat-Lon-Tools = {
-                version = "3.7.0";
-                url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.0/download/";
-                hash = "sha256-J8BlJ8pQ9ZeN+gmFvN1xKBRMC+erxdv2c1pU0OpsSLI=";
+                version = "3.7.1";
+                url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.1/download/";
+                hash = "sha256-XrM2KldXWj/WYgCP4ZG3M3jihgiTvSGookAVdiOC9wc=";
             };
 
 
@@ -491,9 +498,9 @@
 
 
             Shape-Tools = {
-                version = "3.5.0";
-                url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.0/download/";
-                hash = "sha256-jFs6YC6cZN/siTkC4YRiL492ooCJr6L7tsIxAsAb1Gc=";
+                version = "3.5.1";
+                url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.1/download/";
+                hash = "sha256-/9LNOumawgZ6O7bpiDJsBfa0WlqBVva6SmxSMjsoyrw=";
             };
 
 
@@ -505,9 +512,9 @@
 
 
             Search-Layers = {
-                version = "3.0.18";
-                url = "https://plugins.qgis.org/plugins/searchlayers/version/3.0.18/download/";
-                hash = "sha256-kDRhUafcbvqLMLWMnwTOP2tJexjFaoX7gKMggmLX+jo=";
+                version = "3.1.0";
+                url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.0/download/";
+                hash = "sha256-1VaVrykqaXzODgOXn76JAXP0Zzwg3CwsoG0+R7n1AlM=";
             };
 
 

diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix
@@ -64,9 +64,9 @@
 
 
             Lizmap = {
-                version = "4.3.21";
-                url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.21/download/";
-                hash = "sha256-Z20ytfNPeZAXgJAmJOyaWY803uVWHp4fM3sOJL365Qs=";
+                version = "4.3.22";
+                url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.22/download/";
+                hash = "sha256-W5sPoR9UtMhsRAYS4k08KxB680MsgO0FnD8WGWoIhDM=";
             };
 
 
@@ -92,9 +92,9 @@
 
 
             Plugin-Reloader = {
-                version = "0.10";
-                url = "https://plugins.qgis.org/plugins/plugin_reloader/version/0.10/download/";
-                hash = "sha256-xcibvv4rBnRVDw2KwNJTa1QBi8cXVgrD6dcOEjkVia4=";
+                version = "0.11";
+                url = "https://plugins.qgis.org/plugins/plugin_reloader/version/0.11/download/";
+                hash = "sha256-MjqEwsmC5kLLYje2Li9YAVZOD3XjkwlpUmPhrHVNJYs=";
             };
 
 
@@ -113,9 +113,9 @@
 
 
             QGIS-Cloud-Plugin = {
-                version = "3.9.11";
-                url = "https://plugins.qgis.org/plugins/qgiscloud/version/3.9.11/download/";
-                hash = "sha256-luI9JbJ1XFk3fWDnNYZ2TVe0s9zV02Z99QvM20hF844=";
+                version = "3.9.12";
+                url = "https://plugins.qgis.org/plugins/qgiscloud/version/3.9.12/download/";
+                hash = "sha256-IrBVX7MEX6niOIzd+TCFCIKywHqiQbxo/g3LANP30uU=";
             };
 
 
@@ -308,6 +308,13 @@
             };
 
 
+            OpenQuake-Integrated-Risk-Modelling-Toolkit = {
+                version = "3.16.5";
+                url = "https://plugins.qgis.org/plugins/svir/version/3.16.5/download/";
+                hash = "sha256-yVb0J2aIug4bwkDNQPFZT3WbHYBdG8bMsI1l6X1XvW4=";
+            };
+
+
             NNJoin = {
                 version = "3.1.3";
                 url = "https://plugins.qgis.org/plugins/NNJoin/version/3.1.3/download/";
@@ -456,9 +463,9 @@
 
 
             Lat-Lon-Tools = {
-                version = "3.7.0";
-                url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.0/download/";
-                hash = "sha256-J8BlJ8pQ9ZeN+gmFvN1xKBRMC+erxdv2c1pU0OpsSLI=";
+                version = "3.7.1";
+                url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.1/download/";
+                hash = "sha256-XrM2KldXWj/WYgCP4ZG3M3jihgiTvSGookAVdiOC9wc=";
             };
 
 
@@ -491,9 +498,9 @@
 
 
             Shape-Tools = {
-                version = "3.5.0";
-                url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.0/download/";
-                hash = "sha256-jFs6YC6cZN/siTkC4YRiL492ooCJr6L7tsIxAsAb1Gc=";
+                version = "3.5.1";
+                url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.1/download/";
+                hash = "sha256-/9LNOumawgZ6O7bpiDJsBfa0WlqBVva6SmxSMjsoyrw=";
             };
 
 
@@ -505,9 +512,9 @@
 
 
             Search-Layers = {
-                version = "3.0.18";
-                url = "https://plugins.qgis.org/plugins/searchlayers/version/3.0.18/download/";
-                hash = "sha256-kDRhUafcbvqLMLWMnwTOP2tJexjFaoX7gKMggmLX+jo=";
+                version = "3.1.0";
+                url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.0/download/";
+                hash = "sha256-1VaVrykqaXzODgOXn76JAXP0Zzwg3CwsoG0+R7n1AlM=";
             };
 
 

diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix
@@ -168,9 +168,11 @@ in mkDerivation rec {
     # the path at build time using GRASS_PREFIX.
     # Using wrapGAppsHook also prevents file dialogs from crashing the program
     # on non-NixOS.
-    wrapProgram $out/bin/qgis \
-      "''${gappsWrapperArgs[@]}" \
-      --prefix PATH : ${lib.makeBinPath [ grass ]}
+    for program in $out/bin/*; do
+      wrapProgram $program \
+        "''${gappsWrapperArgs[@]}" \
+        --prefix PATH : ${lib.makeBinPath [ grass ]}
+    done
   '';
 
   meta = with lib; {

diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix
@@ -169,9 +169,11 @@ in mkDerivation rec {
     # the path at build time using GRASS_PREFIX.
     # Using wrapGAppsHook also prevents file dialogs from crashing the program
     # on non-NixOS.
-    wrapProgram $out/bin/qgis \
-      "''${gappsWrapperArgs[@]}" \
-      --prefix PATH : ${lib.makeBinPath [ grass ]}
+    for program in $out/bin/*; do
+      wrapProgram $program \
+        "''${gappsWrapperArgs[@]}" \
+        --prefix PATH : ${lib.makeBinPath [ grass ]}
+    done
   '';
 
   meta = with lib; {