Unverified Commit 51aa9a3c authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

pdal: 2.8.1 -> 2.8.2 (#361010)

parents ec990849 5535024a

pkgs/by-name/pd/pdal/package.nix

+2 −19
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, callPackage

, fetchFromGitHub

, fetchpatch

, fetchurl

, testers
@@ -30,23 +29,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "pdal";

  version = "2.8.1";

  version = "2.8.2";



  src = fetchFromGitHub {

    owner = "PDAL";

    repo = "PDAL";

    rev = finalAttrs.version;

    hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM=";

    hash = "sha256-zHy/fZ6vlgbBvYZ1olmkO4qsqW5Y2UU5fT1XQPvNmas=";

  };



  patches = [

    (fetchpatch {

      name = "pdal-tests-gdal-3.10-compatibility.patch";

      url = "https://github.com/PDAL/PDAL/commit/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f.patch";

      hash = "sha256-8AeWcMeZXth6y+Ox1rhK7cEySql//Jig46rHw7PyJh4=";

    })

  ];



  nativeBuildInputs = [

    cmake

    pkg-config
@@ -119,14 +110,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "pdal_app_plugin_test"

  ];



  # Add binary test file that we can’t apply from the patch.

  postPatch = ''

    ln -s ${fetchurl {

      url = "https://github.com/PDAL/PDAL/raw/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f/test/data/gdal/1234_red_0_green_0_blue.tif";

      hash = "sha256-x/jHMhZTKmQxlTkswDGszhBIfP/qgY0zJ8QIz+wR5S4=";

    }} test/data/gdal/1234_red_0_green_0_blue.tif

  '';



  checkPhase = ''

    runHook preCheck

    # tests are flaky and they seem to fail less often when they don't run in