Unverified Commit 3ff27f67 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

opencv: update contrib and test data (#459592)

parents 3d0f84dd 742317f1

pkgs/development/libraries/opencv/4.x.nix

+2 −2
Original line number Diff line number Diff line
@@ -121,14 +121,14 @@ let 
    owner = "opencv";

    repo = "opencv_contrib";

    tag = version;

    hash = "sha256-YNd96qFJ8SHBgDEEsoNps888myGZdELbbuYCae9pW3M=";

    hash = "sha256-3tbscRFryjCynIqh0OWec8CUjXTeIDxOGJkHTK2aIao=";

  };



  testDataSrc = fetchFromGitHub {

    owner = "opencv";

    repo = "opencv_extra";

    tag = version;

    hash = "sha256-EqlGlemztYlk03MX1LAviArWT+OA3/qL3jfgHYC+SP8=";

    hash = "sha256-f8PZyFLdfixt1ApjMc9Cvj9nfEaDRUszSeEfCsWziis=";

  };



  # Contrib must be built in order to enable Tesseract support:

pkgs/development/libraries/opencv/tests.nix

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ runCommand "opencv4-tests" 
    inherit runAccuracyTests;



    accuracyTestNames = [

      "calib3d"

      # "calib3d" # reached a month of CPU time without completing

      "core"

      "features2d"

      "flann"
@@ -69,7 +69,7 @@ runCommand "opencv4-tests" 
    inherit runPerformanceTests;



    performanceTestNames = [

      "calib3d"

      # "calib3d" # reached a month of CPU time without completing

      "core"

      "features2d"

      "imgcodecs"
@@ -83,7 +83,7 @@ runCommand "opencv4-tests" 


    testRunner = optionalString (!isDarwin) "${getExe xvfb-run} -a ";



    requiredSystemFeatures = optionals cudaSupport [ "cuda" ];

    requiredSystemFeatures = [ "big-parallel" ] ++ optionals cudaSupport [ "cuda" ];

  }

  ''

    set -euo pipefail