From 47347d21b933c588d03972a2721c567a9899c2e2 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 19 Aug 2024 01:28:43 +0000 Subject: [PATCH 01/10] 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 fa5219d..3595207 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { From c31e08852980ff862ef0e164d8d776aa6cee9e12 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:40:29 +0200 Subject: [PATCH 02/10] gdal: 3.9.1 -> 3.9.2 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/335158 --- pkgs/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/gdal/default.nix b/pkgs/gdal/default.nix index 611b547..d24d171 100644 --- a/pkgs/gdal/default.nix +++ b/pkgs/gdal/default.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCTQHUU2WYYiliwCJ4PsbvJIOar9LmvXn/i5jJzTCtM="; + hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; }; nativeBuildInputs = [ From 163d6c907192b845e8eb4e17fb8b2e823ec233d2 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:41:54 +0200 Subject: [PATCH 03/10] qgis: 3.38.1 -> 3.38.2 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/335609 --- pkgs/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix index d9b40b0..60fac3c 100644 --- a/pkgs/qgis/unwrapped.nix +++ b/pkgs/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.38.1"; + version = "3.38.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-8fwLn77CK8w4srJNUilfJumDt2wCcQLs9D5/4tzpzPA="; + hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg="; }; passthru = { From d2b06e040215fb0492be54fc1fb527a082ef8e31 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:42:39 +0200 Subject: [PATCH 04/10] qgis-ltr: 3.34.9 -> 3.34.10 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/335610 --- pkgs/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index c178e9c..de19ec1 100644 --- a/pkgs/qgis/unwrapped-ltr.nix +++ b/pkgs/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.9"; + version = "3.34.10"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4ZgCvg3VSa1LJQ8yr45nY4ZI7tyVVdW7WPK/jwBI+HU="; + hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA="; }; passthru = { From d939f8d554cee46a34d70483fc06c109eac04d31 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:43:38 +0200 Subject: [PATCH 05/10] 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 5f64c07..8766866 100644 --- a/pkgs/gdal/master-rev.nix +++ b/pkgs/gdal/master-rev.nix @@ -1,4 +1,4 @@ { - rev = "3527c3f"; - hash = "sha256-nMh3KSaGKRzWQL39/Ab4Ohu5HPwSObxX3cr7K+8nDNU="; + rev = "2a11f6b"; + hash = "sha256-Q2+zgshBmW7bjZqJvmkW7dQ3aYJbu85N0MkYauAQVKY="; } From 7e91a7180d5cccfc708e2ea0e9fea6714727bbe5 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:47:35 +0200 Subject: [PATCH 06/10] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 36 ++++++++++++++--------------- pkgs/qgis/qgis-plugins-list.nix | 36 ++++++++++++++--------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index 7176316..f05dd8d 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.20"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.20/download/"; - hash = "sha256-W0ByHQEChL0Lj3KWCMbHyLW3zCmceJXXjvfwCkQF5dM="; + version = "4.3.21"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.21/download/"; + hash = "sha256-Z20ytfNPeZAXgJAmJOyaWY803uVWHp4fM3sOJL365Qs="; }; @@ -225,9 +225,9 @@ cadastre = { - version = "1.19.2"; - url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/"; - hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg="; + version = "1.20.0"; + url = "https://plugins.qgis.org/plugins/cadastre/version/1.20.0/download/"; + hash = "sha256-enBLTBf9V5Q65yqW1eEVbNf6qIPe5ghsDJUHFTReyFU="; }; @@ -456,9 +456,9 @@ Lat-Lon-Tools = { - version = "3.6.20"; - url = "https://plugins.qgis.org/plugins/latlontools/version/3.6.20/download/"; - hash = "sha256-qS6i7SJ4nZC/6InodC+sBShqX4a0F/ga1POxaW6uv4A="; + version = "3.7.0"; + url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.0/download/"; + hash = "sha256-J8BlJ8pQ9ZeN+gmFvN1xKBRMC+erxdv2c1pU0OpsSLI="; }; @@ -491,9 +491,9 @@ Shape-Tools = { - version = "3.4.19"; - url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/"; - hash = "sha256-cqRxzX3l4qVfcb9ydMgooYjKN/IR2jKrK7TukK0PMtY="; + version = "3.5.0"; + url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.0/download/"; + hash = "sha256-jFs6YC6cZN/siTkC4YRiL492ooCJr6L7tsIxAsAb1Gc="; }; @@ -631,9 +631,9 @@ MapTiler = { - version = "3.3.1"; - url = "https://plugins.qgis.org/plugins/qgis-maptiler-plugin/version/3.3.1/download/"; - hash = "sha256-35n5FtL2Xk1gEdiF1x5c4RZBOPI3kkhh/1rC/oDnHAc="; + version = "3.3.2"; + url = "https://plugins.qgis.org/plugins/qgis-maptiler-plugin/version/3.3.2/download/"; + hash = "sha256-d1drAa64c9JME3Lx6gS4FCjAwEFpm9fOB9bH52QoRqY="; }; @@ -673,9 +673,9 @@ Mapflow = { - version = "2.6.1"; - url = "https://plugins.qgis.org/plugins/mapflow/version/2.6.1/download/"; - hash = "sha256-DGpuOqrPD4JT0AyX8E8jKb0+ONn0VjiB/Upq76BCYeA="; + version = "2.6.2"; + url = "https://plugins.qgis.org/plugins/mapflow/version/2.6.2/download/"; + hash = "sha256-3D8WdVK8Z7bBrxL8aEX1bbh/xOPnFd3JM6nDoqKGIUg="; }; diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix index f203155..139fc36 100644 --- a/pkgs/qgis/qgis-plugins-list.nix +++ b/pkgs/qgis/qgis-plugins-list.nix @@ -64,9 +64,9 @@ Lizmap = { - version = "4.3.20"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.20/download/"; - hash = "sha256-W0ByHQEChL0Lj3KWCMbHyLW3zCmceJXXjvfwCkQF5dM="; + version = "4.3.21"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.21/download/"; + hash = "sha256-Z20ytfNPeZAXgJAmJOyaWY803uVWHp4fM3sOJL365Qs="; }; @@ -225,9 +225,9 @@ cadastre = { - version = "1.19.2"; - url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/"; - hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg="; + version = "1.20.0"; + url = "https://plugins.qgis.org/plugins/cadastre/version/1.20.0/download/"; + hash = "sha256-enBLTBf9V5Q65yqW1eEVbNf6qIPe5ghsDJUHFTReyFU="; }; @@ -456,9 +456,9 @@ Lat-Lon-Tools = { - version = "3.6.20"; - url = "https://plugins.qgis.org/plugins/latlontools/version/3.6.20/download/"; - hash = "sha256-qS6i7SJ4nZC/6InodC+sBShqX4a0F/ga1POxaW6uv4A="; + version = "3.7.0"; + url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.0/download/"; + hash = "sha256-J8BlJ8pQ9ZeN+gmFvN1xKBRMC+erxdv2c1pU0OpsSLI="; }; @@ -491,9 +491,9 @@ Shape-Tools = { - version = "3.4.19"; - url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/"; - hash = "sha256-cqRxzX3l4qVfcb9ydMgooYjKN/IR2jKrK7TukK0PMtY="; + version = "3.5.0"; + url = "https://plugins.qgis.org/plugins/shapetools/version/3.5.0/download/"; + hash = "sha256-jFs6YC6cZN/siTkC4YRiL492ooCJr6L7tsIxAsAb1Gc="; }; @@ -631,9 +631,9 @@ MapTiler = { - version = "3.3.1"; - url = "https://plugins.qgis.org/plugins/qgis-maptiler-plugin/version/3.3.1/download/"; - hash = "sha256-35n5FtL2Xk1gEdiF1x5c4RZBOPI3kkhh/1rC/oDnHAc="; + version = "3.3.2"; + url = "https://plugins.qgis.org/plugins/qgis-maptiler-plugin/version/3.3.2/download/"; + hash = "sha256-d1drAa64c9JME3Lx6gS4FCjAwEFpm9fOB9bH52QoRqY="; }; @@ -673,9 +673,9 @@ Mapflow = { - version = "2.6.1"; - url = "https://plugins.qgis.org/plugins/mapflow/version/2.6.1/download/"; - hash = "sha256-DGpuOqrPD4JT0AyX8E8jKb0+ONn0VjiB/Upq76BCYeA="; + version = "2.6.2"; + url = "https://plugins.qgis.org/plugins/mapflow/version/2.6.2/download/"; + hash = "sha256-3D8WdVK8Z7bBrxL8aEX1bbh/xOPnFd3JM6nDoqKGIUg="; }; From f3037f7351b617fb51356286e718afc4c0520722 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 10:48:18 +0200 Subject: [PATCH 07/10] grass-plugins: weekly update --- pkgs/grass/plugins-list.nix | 8 +++++++- pkgs/grass/plugins-rev.nix | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/grass/plugins-list.nix b/pkgs/grass/plugins-list.nix index edf6005..50a198d 100644 --- a/pkgs/grass/plugins-list.nix +++ b/pkgs/grass/plugins-list.nix @@ -56,7 +56,7 @@ g-download-location = { name = "g.download.location"; - description = ''Download GRASS Location from the web Get GRASS Location from an URL or file path''; + description = ''Download GRASS project (location) from the web Get GRASS project from an URL or file path''; }; @@ -1554,6 +1554,12 @@ }; + t-stac = { + name = "t.stac"; + description = ''None''; + }; + + v-area-weigh = { name = "v.area.weigh"; description = ''Rasterize vector areas using weights''; diff --git a/pkgs/grass/plugins-rev.nix b/pkgs/grass/plugins-rev.nix index 8c04b62..d620e81 100644 --- a/pkgs/grass/plugins-rev.nix +++ b/pkgs/grass/plugins-rev.nix @@ -1,4 +1,4 @@ { - rev = "d6fc6d5"; - hash = "sha256-FkXgVuDZywY9IXYkjCg2A/WHfqVfnZrJ5HFiH47SUSY="; + rev = "8f99872"; + hash = "sha256-O+NQIFcmGtjgW0ihYrgV0A7wIyi+Nx160s42CQZXk+Q="; } From 5677b800099ddb4641a8b7bbf148425ca6eeb7a1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 11:42:33 +0200 Subject: [PATCH 08/10] grass-plugins: disable i.sentinel due to missing pystac in geonix --- pkgs/grass/plugins-list.nix | 6 ------ pkgs/grass/plugins.nix | 1 + pkgs/grass/update-plugins.py | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/grass/plugins-list.nix b/pkgs/grass/plugins-list.nix index 50a198d..a5c018c 100644 --- a/pkgs/grass/plugins-list.nix +++ b/pkgs/grass/plugins-list.nix @@ -300,12 +300,6 @@ }; - i-sentinel = { - name = "i.sentinel"; - description = ''None''; - }; - - i-signature-copy = { name = "i.signature.copy"; description = ''Copies signature file from a group/subgroup to another group/subgroup.''; diff --git a/pkgs/grass/plugins.nix b/pkgs/grass/plugins.nix index b98fe82..6b31b4b 100644 --- a/pkgs/grass/plugins.nix +++ b/pkgs/grass/plugins.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation { ++ lib.optionals (name == "i-eodag") [ pytz ] ++ lib.optionals (name == "wx-metadata") [ wxpython ] ++ lib.optionals (name == "r-in-vect") [ python3-gdal ] + # ++ lib.optionals (name == "i-sentinel") [ pystac ] # non python ++ lib.optionals (name == "r-out-tiff") [ libtiff ] diff --git a/pkgs/grass/update-plugins.py b/pkgs/grass/update-plugins.py index fc4e4f3..05b7c52 100644 --- a/pkgs/grass/update-plugins.py +++ b/pkgs/grass/update-plugins.py @@ -25,6 +25,7 @@ "v.stats", # can't build "i.pr", # can't build "wx.mwprecip", # can't build + "i.sentinel", # missing pystac in geonix ] def fix_plugin_name(name): From 01d91a0ec7c9ad7bfd9df8d8359b92a36cc0d6cd Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 11:42:56 +0200 Subject: [PATCH 09/10] grass-plugins: add build dependency for i.landsat --- pkgs/grass/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/grass/plugins.nix b/pkgs/grass/plugins.nix index 6b31b4b..244dc54 100644 --- a/pkgs/grass/plugins.nix +++ b/pkgs/grass/plugins.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation { ++ lib.optionals (name == "i-eodag") [ pytz ] ++ lib.optionals (name == "wx-metadata") [ wxpython ] ++ lib.optionals (name == "r-in-vect") [ python3-gdal ] + ++ lib.optionals (name == "i-landsat") [ pyyaml] # ++ lib.optionals (name == "i-sentinel") [ pystac ] # non python From 878b429006d79b3bafc998bf364bff8139b4ea5a Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 22 Aug 2024 12:31:12 +0200 Subject: [PATCH 10/10] grass-plugins: disable t.stac due to missing pystac in geonix --- pkgs/grass/plugins-list.nix | 6 ------ pkgs/grass/update-plugins.py | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/grass/plugins-list.nix b/pkgs/grass/plugins-list.nix index a5c018c..d6b6278 100644 --- a/pkgs/grass/plugins-list.nix +++ b/pkgs/grass/plugins-list.nix @@ -1548,12 +1548,6 @@ }; - t-stac = { - name = "t.stac"; - description = ''None''; - }; - - v-area-weigh = { name = "v.area.weigh"; description = ''Rasterize vector areas using weights''; diff --git a/pkgs/grass/update-plugins.py b/pkgs/grass/update-plugins.py index 05b7c52..c5c2be0 100644 --- a/pkgs/grass/update-plugins.py +++ b/pkgs/grass/update-plugins.py @@ -26,6 +26,7 @@ "i.pr", # can't build "wx.mwprecip", # can't build "i.sentinel", # missing pystac in geonix + "t.stac", # missing pystac in geonix ] def fix_plugin_name(name):