From e21aecdc354b406d6de6428badbfff98414dad63 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 16 Sep 2024 11:16:09 +0200 Subject: [PATCH 1/2] qgis-ltr: 3.34.10 -> 3.34.11 --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 446a02e584ea..1e12b435c78a 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -78,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.10"; + version = "3.34.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA="; + hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0="; }; passthru = { From 5c771e30e33e2fd9fc4ca035ed389976dbf63e4e Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 16 Sep 2024 11:16:55 +0200 Subject: [PATCH 2/2] qgis-ltr: drop redundant CMAKE_BUILD_TYPE setting CMAKE_BUILD_TYPE=Release is set by default in https://github.com/NixOS/nixpkgs/blob/040bd3d95a6478c942fed4c22c589345bee76337/pkgs/by-name/cm/cmake/setup-hook.sh#L113 --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1e12b435c78a..17af854eabda 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -151,7 +151,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False"