From d7161baf3a10426cc7b4ba514ef2a82ff6980edd Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 2 Sep 2024 01:29:01 +0000 Subject: [PATCH 1/7] flake: weekly update of nix flake inputs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 791ad0e..65d1598 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { From a914a029a11facd1b0fb5befe48c1d2139fc082c Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:41:24 +0200 Subject: [PATCH 2/7] python3-fiona: 1.9.6 -> 1.10.0 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/339443 --- pkgs/fiona/default.nix | 48 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/fiona/default.nix b/pkgs/fiona/default.nix index 753bcc3..49076c4 100644 --- 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; }; } From 42a55738c5c7fa414ed1cfcc1d38372d13b7cbe9 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:42:21 +0200 Subject: [PATCH 3/7] qgis: wrap all binaries Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/339337 --- pkgs/qgis/default.nix | 10 +++++----- pkgs/qgis/ltr.nix | 10 +++++----- pkgs/qgis/unwrapped-ltr.nix | 8 +++++--- pkgs/qgis/unwrapped.nix | 8 +++++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/qgis/default.nix b/pkgs/qgis/default.nix index 8a2a438..4c64127 100644 --- 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 index 67c1901..d9beb0d 100644 --- 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/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index de19ec1..bbbf37b 100644 --- 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 index 60fac3c..65988d7 100644 --- 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; { From ddb616044180ad20e2e38090da73e759bfd0209d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:43:35 +0200 Subject: [PATCH 4/7] python3-rasterio: 1.3.10 -> 1.3.11 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/339740 --- pkgs/rasterio/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/rasterio/default.nix b/pkgs/rasterio/default.nix index d7ab45f..8536f1b 100644 --- a/pkgs/rasterio/default.nix +++ b/pkgs/rasterio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.10"; + version = "1.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-FidUaSpbTR8X1/Cqy/IwApkOOl2RRtPqYJaSISRPThI="; + hash = "sha256-Yh3n2oyARf7LAtJU8Oa3WWc+oscl7e2N7jpW0v1uTVk="; }; postPatch = '' @@ -49,9 +49,9 @@ buildPythonPackage rec { substituteInPlace rasterio/rio/calc.py \ --replace-fail "from distutils.version import LooseVersion" "" - # relax dependency on yet non-packaged, RC version of numpy + # relax numpy dependency substituteInPlace pyproject.toml \ - --replace-fail "numpy==2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0,<3.0" "numpy" ''; nativeBuildInputs = [ @@ -99,12 +99,6 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" - - # Failing with GDAL 3.9. - # Fixed in https://github.com/rasterio/rasterio/commit/24d0845e576158217f6541c3c81b163d873a994d - # Re-enable in next rasterio update. - "test_create_sidecar_mask" - "test_update_tags" ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; From 662bdd1a15b61441d535fcc07bae84820be763e3 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:44:12 +0200 Subject: [PATCH 5/7] gdal-master: weekly update --- pkgs/gdal/master-rev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/gdal/master-rev.nix b/pkgs/gdal/master-rev.nix index cb0ad71..0f3dfac 100644 --- 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="; } From 941b5e11f5e3549a56c6a50a75674a0ca89a91db Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:47:47 +0200 Subject: [PATCH 6/7] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 43 +++++++++++++++++------------ pkgs/qgis/qgis-plugins-list.nix | 43 +++++++++++++++++------------ 2 files changed, 50 insertions(+), 36 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index 8b8cad3..c31eb49 100644 --- 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 index 7cb084a..8fa774a 100644 --- 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="; }; From b7849b6f1bd8d6b2ce3b1d78e3eb0cc9ac468fa0 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 10:48:16 +0200 Subject: [PATCH 7/7] grass-plugins: weekly update --- pkgs/grass/plugins-rev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/grass/plugins-rev.nix b/pkgs/grass/plugins-rev.nix index 7171a59..c409a57 100644 --- 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="; }