From 940adc38beabf73fc166720f83b124701da52706 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sat, 6 Aug 2022 13:53:06 -0500
Subject: [PATCH 1/2] cloudcompare: 2.12.1 -> 2.12.4

---
 pkgs/applications/graphics/cloudcompare/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index acbf572cb41d..9b3a22f8b4e6 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -23,13 +23,13 @@
 
 mkDerivation rec {
   pname = "cloudcompare";
-  version = "2.12.1";
+  version = "2.12.4";
 
   src = fetchFromGitHub {
     owner = "CloudCompare";
     repo = "CloudCompare";
     rev = "v${version}";
-    sha256 = "sha256-gX07Km+DNnsz5eDAC2RueMHjmIfQvgGnNOujZ/yM/vE=";
+    sha256 = "sha256-rQ9/vS/fyRWGBL4UGPNSeeNsDtnRHEp9NCViBtu/QEs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e2c1fd01cc6..6e9b94d4f5c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15660,9 +15660,7 @@ with pkgs;
 
   cloud-nuke = callPackage ../development/tools/cloud-nuke { };
 
-  cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {
-    pdal = pdal_2_3;
-  };
+  cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
 
   cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };
 

From 495266d3d0a241834b14421a420873659dcfdb36 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sat, 6 Aug 2022 13:53:56 -0500
Subject: [PATCH 2/2] pdal_2_3: remove

Introduced and used by CloudCompare 2.12.1, which has now been
upgraded.
---
 pkgs/development/libraries/pdal/2_3.nix | 89 -------------------------
 pkgs/top-level/all-packages.nix         |  2 -
 2 files changed, 91 deletions(-)
 delete mode 100644 pkgs/development/libraries/pdal/2_3.nix

diff --git a/pkgs/development/libraries/pdal/2_3.nix b/pkgs/development/libraries/pdal/2_3.nix
deleted file mode 100644
index 094697ba1c18..000000000000
--- a/pkgs/development/libraries/pdal/2_3.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, pkg-config
-, openscenegraph
-, curl
-, gdal
-, hdf5-cpp
-, LASzip
-, libe57format
-, libgeotiff
-, libxml2
-, postgresql
-, tiledb
-, xercesc
-, zlib
-, zstd
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pdal";
-  version = "2.3.0";
-
-  src = fetchFromGitHub {
-    owner = "PDAL";
-    repo = "PDAL";
-    rev = version;
-    sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc=";
-  };
-
-  patches = [
-    # fix build with GCC 11
-    (fetchpatch {
-      url = "https://github.com/PDAL/PDAL/commit/47e1eb2dc884d1b8c5caa8e3b48ef90f4f12c68d.patch";
-      hash = "sha256-Ls2LkVpbwQAMt2Iuq0zq9D9l2eyP8m1IO3poCnbxGDU=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    openscenegraph
-    curl
-    gdal
-    hdf5-cpp
-    LASzip
-    libe57format
-    libgeotiff
-    libxml2
-    postgresql
-    tiledb
-    xercesc
-    zlib
-    zstd
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_PLUGIN_E57=ON"
-    "-DBUILD_PLUGIN_HDF=ON"
-    "-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
-    "-DBUILD_PLUGIN_TILEDB=ON"
-
-    # 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"
-  ];
-
-  meta = with lib; {
-    description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
-    homepage = "https://pdal.io";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nh2 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e9b94d4f5c7..66b5ddd9f010 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20590,8 +20590,6 @@ with pkgs;
 
   pdal = callPackage ../development/libraries/pdal { } ;
 
-  pdal_2_3 = callPackage ../development/libraries/pdal/2_3.nix { } ;
-
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
   pe-parse = callPackage ../development/libraries/pe-parse { };