From 356548687f852629f783ac20636b49054e081525 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 1 Jul 2024 01:28:50 +0000 Subject: [PATCH 1/6] 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 eea1cd4..d716511 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { From 9d33c9960f1cd2f53e5c188a9fbc277bdf9fa65b Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 4 Jul 2024 15:33:44 +0200 Subject: [PATCH 2/6] qgis-ltr: 3.34.7 -> 3.34.8 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/321562 --- pkgs/qgis/unwrapped-ltr.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index 4d07c9a..c539ab8 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.7"; + version = "3.34.8"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo="; + hash = "sha256-UeyGx+C7szXv++hXFV006Xk4oSKfSj4teJIwaD4ODVk="; }; passthru = { @@ -143,9 +143,7 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -160,7 +158,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below From a45799152ee9c10e6735e4a7968dffbb66a47946 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 4 Jul 2024 15:38:49 +0200 Subject: [PATCH 3/6] gdal: 3.9.0 -> 3.9.1 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/322663 --- pkgs/gdal/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/gdal/default.nix b/pkgs/gdal/default.nix index f8bf3f7..611b547 100644 --- a/pkgs/gdal/default.nix +++ b/pkgs/gdal/default.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchFromGitHub -, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -80,23 +79,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; + hash = "sha256-WCTQHUU2WYYiliwCJ4PsbvJIOar9LmvXn/i5jJzTCtM="; }; - patches = [ - # HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch"; - sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc="; - }) - ]; - nativeBuildInputs = [ bison cmake From aedc23a69dabbd083dd1a4f8affcce30fad59b72 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 4 Jul 2024 15:39:55 +0200 Subject: [PATCH 4/6] 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 f04de0a..fdcc5d2 100644 --- a/pkgs/gdal/master-rev.nix +++ b/pkgs/gdal/master-rev.nix @@ -1,4 +1,4 @@ { - rev = "d6a7db5"; - hash = "sha256-ZUhYNpQSSTv0nDHRdWCjtQTxmCZsr74QUcqgtz/I/kc="; + rev = "c89aeb4"; + hash = "sha256-aiYwZaXonn8FHz8jYDCSl+tLSnoQO1Xkdrx84HcgdxY="; } From 0e87c2a1bbbb98cdb60ea9afc7f23e0dce5ad2e3 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 4 Jul 2024 15:45:01 +0200 Subject: [PATCH 5/6] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 31 ++++++++++++++++++----------- pkgs/qgis/qgis-plugins-list.nix | 31 ++++++++++++++++++----------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index ef81b08..12e2ccd 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.17"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.17/download/"; - hash = "sha256-slw8raRUsr+MaO37vgJamB9vN4Bmlo46CMwesO4TlvM="; + version = "4.3.19"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.19/download/"; + hash = "sha256-qbSlsGyDnDw1becVPIchDNAS2w1Sk2KnoZAM0xbRpUA="; }; @@ -155,9 +155,9 @@ PDOK-services-plugin = { - version = "5.0.1"; - url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.0.1/download/"; - hash = "sha256-vAdRuDASeEIUju2JNDO4srLk7Eq1wp70CQ5hd4yomuI="; + version = "5.1.0"; + url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.1.0/download/"; + hash = "sha256-TgpNgGSOLKmsP+It0xLkZqFCrBD8/aZrMbyRj9ZD/0w="; }; @@ -225,9 +225,9 @@ cadastre = { - version = "1.19.1"; - url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/"; - hash = "sha256-JfmRXMqIcyezppFNGdRcUYjC0hvdJm9wOqF2GPPNkrI="; + version = "1.19.2"; + url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/"; + hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg="; }; @@ -483,6 +483,13 @@ }; + Plugin-Builder-3 = { + version = "3.2.1"; + url = "https://plugins.qgis.org/plugins/pluginbuilder3/version/3.2.1/download/"; + hash = "sha256-60ZjJtc5aTgsTh3uJ5Qb1Eg1izNlkn4TB7TA7o3l+uU="; + }; + + Shape-Tools = { version = "3.4.19"; url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/"; @@ -638,9 +645,9 @@ Pobieracz-danych-GUGiK = { - version = "1.2.0"; - url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.0/download/"; - hash = "sha256-cs6sidg3ND+vENo3o0jBjPUO9iTMmrwr71ySKkzdeVs="; + version = "1.2.1"; + url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.1/download/"; + hash = "sha256-F4FSRmQbf13zxyu+VC2kcl6GsXQA5KXNpQPapZqKkGE="; }; diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix index 98ee9df..602e86a 100644 --- a/pkgs/qgis/qgis-plugins-list.nix +++ b/pkgs/qgis/qgis-plugins-list.nix @@ -64,9 +64,9 @@ Lizmap = { - version = "4.3.17"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.17/download/"; - hash = "sha256-slw8raRUsr+MaO37vgJamB9vN4Bmlo46CMwesO4TlvM="; + version = "4.3.19"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.19/download/"; + hash = "sha256-qbSlsGyDnDw1becVPIchDNAS2w1Sk2KnoZAM0xbRpUA="; }; @@ -155,9 +155,9 @@ PDOK-services-plugin = { - version = "5.0.1"; - url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.0.1/download/"; - hash = "sha256-vAdRuDASeEIUju2JNDO4srLk7Eq1wp70CQ5hd4yomuI="; + version = "5.1.0"; + url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.1.0/download/"; + hash = "sha256-TgpNgGSOLKmsP+It0xLkZqFCrBD8/aZrMbyRj9ZD/0w="; }; @@ -225,9 +225,9 @@ cadastre = { - version = "1.19.1"; - url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/"; - hash = "sha256-JfmRXMqIcyezppFNGdRcUYjC0hvdJm9wOqF2GPPNkrI="; + version = "1.19.2"; + url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/"; + hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg="; }; @@ -483,6 +483,13 @@ }; + Plugin-Builder-3 = { + version = "3.2.1"; + url = "https://plugins.qgis.org/plugins/pluginbuilder3/version/3.2.1/download/"; + hash = "sha256-60ZjJtc5aTgsTh3uJ5Qb1Eg1izNlkn4TB7TA7o3l+uU="; + }; + + Shape-Tools = { version = "3.4.19"; url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/"; @@ -638,9 +645,9 @@ Pobieracz-danych-GUGiK = { - version = "1.2.0"; - url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.0/download/"; - hash = "sha256-cs6sidg3ND+vENo3o0jBjPUO9iTMmrwr71ySKkzdeVs="; + version = "1.2.1"; + url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.1/download/"; + hash = "sha256-F4FSRmQbf13zxyu+VC2kcl6GsXQA5KXNpQPapZqKkGE="; }; From a8bffcae8adb49ff0f14001a98f1d5fd22e0420f Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 4 Jul 2024 16:49:08 +0200 Subject: [PATCH 6/6] test(custom-package): use local flake for packages --- tests/custom-package/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/custom-package/flake.nix b/tests/custom-package/flake.nix index b7e3f9c..d22c78f 100644 --- a/tests/custom-package/flake.nix +++ b/tests/custom-package/flake.nix @@ -12,7 +12,7 @@ }; inputs = { - geonix.url = "github:imincik/geospatial-nix"; + geonix.url = "path:../../."; nixpkgs.follows = "geonix/nixpkgs"; };