From e3b35b5fc133df9dbb25445298dc83b094b41a60 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 25 Jan 2024 10:19:58 +0100 Subject: qgis-ltr: disable PDAL support QGIS-LTR is failing to build with PDAL 2.6. PDAL support can be re-enabled once https://github.com/qgis/QGIS/pull/54940 is backported. Closes #281266 . --- pkgs/applications/gis/qgis/pdal-2_5.nix | 131 --------------------------- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 11 +-- 2 files changed, 4 insertions(+), 138 deletions(-) delete mode 100644 pkgs/applications/gis/qgis/pdal-2_5.nix diff --git a/pkgs/applications/gis/qgis/pdal-2_5.nix b/pkgs/applications/gis/qgis/pdal-2_5.nix deleted file mode 100644 index 40d6ff5a719c7..0000000000000 --- a/pkgs/applications/gis/qgis/pdal-2_5.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ lib -, stdenv -, callPackage -, fetchFromGitHub -, testers - -, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format - -, cmake -, curl -, gdal -, hdf5-cpp -, LASzip -, libe57format -, libgeotiff -, libtiff -, libxml2 -, openscenegraph -, pkg-config -, postgresql -, tiledb -, xercesc -, zlib -, zstd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pdal"; - version = "2.5.6"; - - src = fetchFromGitHub { - owner = "PDAL"; - repo = "PDAL"; - rev = finalAttrs.version; - sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - curl - gdal - hdf5-cpp - LASzip - libgeotiff - libtiff - libxml2 - openscenegraph - postgresql - tiledb - xercesc - zlib - zstd - ] ++ lib.optionals enableE57 [ - libe57format - ]; - - cmakeFlags = [ - "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" - "-DBUILD_PLUGIN_HDF=ON" - "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" - "-DBUILD_PLUGIN_TILEDB=ON" - "-DWITH_TESTS=ON" - "-DBUILD_PGPOINTCLOUD_TESTS=OFF" - - # Plugins can probably not be made work easily: - "-DBUILD_PLUGIN_CPD=OFF" - "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs - "-DBUILD_PLUGIN_GEOWAVE=OFF" - "-DBUILD_PLUGIN_I3S=OFF" - "-DBUILD_PLUGIN_ICEBRIDGE=OFF" - "-DBUILD_PLUGIN_MATLAB=OFF" - "-DBUILD_PLUGIN_MBIO=OFF" - "-DBUILD_PLUGIN_MRSID=OFF" - "-DBUILD_PLUGIN_NITF=OFF" - "-DBUILD_PLUGIN_OCI=OFF" - "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs - "-DBUILD_PLUGIN_RIVLIB=OFF" - ]; - - doCheck = true; - - disabledTests = [ - # Tests failing due to TileDB library implementation, disabled also - # by upstream CI. - # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 - "pdal_io_tiledb_writer_test" - "pdal_io_tiledb_reader_test" - "pdal_io_tiledb_time_writer_test" - "pdal_io_tiledb_time_reader_test" - "pdal_io_tiledb_bit_fields_test" - "pdal_io_e57_read_test" - "pdal_io_e57_write_test" - "pdal_io_stac_reader_test" - - # Segfault - "pdal_io_hdf_reader_test" - - # Failure - "pdal_app_plugin_test" - ]; - - checkPhase = '' - runHook preCheck - # tests are flaky and they seem to fail less often when they don't run in - # parallel - ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' - runHook postCheck - ''; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "pdal --version"; - version = "pdal ${finalAttrs.finalPackage.version}"; - }; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; - homepage = "https://pdal.io"; - license = licenses.bsd3; - maintainers = teams.geospatial.members; - platforms = platforms.all; - pkgConfigModules = [ "pdal" ]; - }; -}) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 7a19b6b94b4a9..6951247283273 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -47,11 +47,6 @@ }: let - - # replace with global pdal version once - # https://github.com/qgis/QGIS/pull/54940 is backported - pdal = callPackage ./pdal-2_5.nix { }; - py = python3.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { @@ -132,7 +127,7 @@ in mkDerivation rec { qtserialport qtxmlpatterns qt3d - pdal + # pdal zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit @@ -151,9 +146,11 @@ in mkDerivation rec { }) ]; + # PDAL is disabled until https://github.com/qgis/QGIS/pull/54940 + # is backported. cmakeFlags = [ "-DWITH_3D=True" - "-DWITH_PDAL=TRUE" + "-DWITH_PDAL=False" # TODO: re-enable PDAL "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let -- cgit 1.4.1