From f40e866b693e7e9c68df47e3440353597c4336a5 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 6 Sep 2024 09:54:13 +0200 Subject: [PATCH 1/2] pdal: 2.7.2 -> 2.8.0 --- pkgs/development/libraries/pdal/default.nix | 8 ++------ pkgs/development/libraries/pdal/pdal.pc.in.patch | 12 ------------ 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/pdal/pdal.pc.in.patch diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index c85459c244c9..a88dddf1ddae 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -28,19 +28,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; + sha256 = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; }; - patches = [ - ./pdal.pc.in.patch - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/pdal/pdal.pc.in.patch b/pkgs/development/libraries/pdal/pdal.pc.in.patch deleted file mode 100644 index 1d981c0f6a97..000000000000 --- a/pkgs/development/libraries/pdal/pdal.pc.in.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in -index 6885221cacc8..a07ee82cea68 100644 ---- a/apps/pdal.pc.in -+++ b/apps/pdal.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@/bin --libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - includedir=@CMAKE_INSTALL_PREFIX@/include - - Name: PDAL From 266ce052d3f928f7cdf18b2d2c2ca181b5683767 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 7 Sep 2024 18:43:43 +0200 Subject: [PATCH 2/2] pdal: use hash instead of sha256 Co-authored-by: Nikolay Korotkiy --- pkgs/development/libraries/pdal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index a88dddf1ddae..2ab81728d5ea 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; + hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; }; nativeBuildInputs = [