pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #256550 from bcdarwin/opencv-updates

{caffe,mxnet,sdrangel,video2midi,waifu2x-converter-cpp}: opencv3 -> opencv4

authored by

Mario Rodas and committed by
GitHub f811a92b 0ff30cd3

+23 -19
unified split
+2 -2
pkgs/applications/radio/sdrangel/default.nix
··· 24 , libbladeRF 25 , mbelib 26 , ninja 27 - , opencv3 28 , pkg-config 29 , qtcharts 30 , qtdeclarative ··· 90 libusb1 91 limesuite 92 mbelib 93 - opencv3 94 qtcharts 95 qtdeclarative 96 qtgamepad
··· 24 , libbladeRF 25 , mbelib 26 , ninja 27 + , opencv4 28 , pkg-config 29 , qtcharts 30 , qtdeclarative ··· 90 libusb1 91 limesuite 92 mbelib 93 + opencv4 94 qtcharts 95 qtdeclarative 96 qtgamepad
+9 -3
pkgs/applications/science/math/caffe/default.nix
··· 1 { config, stdenv, lib 2 , fetchFromGitHub 3 , fetchurl 4 , cmake 5 , boost 6 , gflags 7 , glog 8 , hdf5-cpp 9 - , opencv3 10 , protobuf 11 , doxygen 12 , blas ··· 71 ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] 72 ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; 73 74 - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] 75 ++ lib.optional cudaSupport cudatoolkit 76 ++ lib.optional cudnnSupport cudnn 77 ++ lib.optional lmdbSupport lmdb ··· 96 97 patches = [ 98 ./darwin.patch 99 ] ++ lib.optional pythonSupport (substituteAll { 100 src = ./python.patch; 101 inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy ··· 148 ''; 149 homepage = "http://caffe.berkeleyvision.org/"; 150 maintainers = with maintainers; [ ]; 151 - broken = pythonSupport && (python.isPy310); 152 license = licenses.bsd2; 153 platforms = platforms.linux ++ platforms.darwin; 154 };
··· 1 { config, stdenv, lib 2 , fetchFromGitHub 3 , fetchurl 4 + , fetchpatch 5 , cmake 6 , boost 7 , gflags 8 , glog 9 , hdf5-cpp 10 + , opencv4 11 , protobuf 12 , doxygen 13 , blas ··· 72 ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] 73 ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; 74 75 + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] 76 ++ lib.optional cudaSupport cudatoolkit 77 ++ lib.optional cudnnSupport cudnn 78 ++ lib.optional lmdbSupport lmdb ··· 97 98 patches = [ 99 ./darwin.patch 100 + (fetchpatch { 101 + name = "support-opencv4"; 102 + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; 103 + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; 104 + }) 105 ] ++ lib.optional pythonSupport (substituteAll { 106 src = ./python.patch; 107 inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy ··· 154 ''; 155 homepage = "http://caffe.berkeleyvision.org/"; 156 maintainers = with maintainers; [ ]; 157 + broken = (pythonSupport && (python.isPy310)) || cudaSupport; 158 license = licenses.bsd2; 159 platforms = platforms.linux ++ platforms.darwin; 160 };
+2 -2
pkgs/applications/science/math/mxnet/default.nix
··· 1 { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake 2 - , opencv3, gtest, blas, gomp, llvmPackages, perl 3 , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 4 , cudnnSupport ? cudaSupport 5 }: ··· 37 38 nativeBuildInputs = [ cmake perl ]; 39 40 - buildInputs = [ opencv3 gtest blas.provider ] 41 ++ lib.optional stdenv.cc.isGNU gomp 42 ++ lib.optional stdenv.cc.isClang llvmPackages.openmp 43 # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib
··· 1 { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake 2 + , opencv4, gtest, blas, gomp, llvmPackages, perl 3 , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 4 , cudnnSupport ? cudaSupport 5 }: ··· 37 38 nativeBuildInputs = [ cmake perl ]; 39 40 + buildInputs = [ opencv4 gtest blas.provider ] 41 ++ lib.optional stdenv.cc.isGNU gomp 42 ++ lib.optional stdenv.cc.isClang llvmPackages.openmp 43 # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib
+3 -3
pkgs/tools/audio/video2midi/default.nix
··· 1 - { lib, fetchFromGitHub, pythonPackages, opencv3 }: 2 3 let 4 - opencv3_ = pythonPackages.toPythonModule (opencv3.override { 5 inherit pythonPackages; 6 enablePython = true; 7 enableFfmpeg = true; ··· 19 sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam"; 20 }; 21 22 - propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; 23 24 installPhase = '' 25 install -Dm755 v2m.py $out/bin/v2m.py
··· 1 + { lib, fetchFromGitHub, pythonPackages, opencv4 }: 2 3 let 4 + opencv4_ = pythonPackages.toPythonModule (opencv4.override { 5 inherit pythonPackages; 6 enablePython = true; 7 enableFfmpeg = true; ··· 19 sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam"; 20 }; 21 22 + propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ]; 23 24 installPhase = '' 25 install -Dm755 v2m.py $out/bin/v2m.py
-2
pkgs/tools/graphics/gmic-qt/default.nix
··· 17 , libtiff 18 , ninja 19 , nix-update 20 - , opencv3 21 , openexr 22 , pkg-config 23 , qtbase ··· 78 libjpeg 79 libtiff 80 libpng 81 - opencv3 82 openexr 83 graphicsmagick 84 curl
··· 17 , libtiff 18 , ninja 19 , nix-update 20 , openexr 21 , pkg-config 22 , qtbase ··· 77 libjpeg 78 libtiff 79 libpng 80 openexr 81 graphicsmagick 82 curl
+2 -2
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
··· 1 - { cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL 2 , config 3 , cudaSupport ? config.cudaSupport, cudatoolkit ? null 4 }: ··· 20 ]; 21 22 buildInputs = [ 23 - opencv3 24 ] ++ lib.optional cudaSupport cudatoolkit 25 ++ lib.optional stdenv.isDarwin OpenCL 26 ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ];
··· 1 + { cmake, fetchFromGitHub, makeWrapper, opencv4, lib, stdenv, ocl-icd, opencl-headers, OpenCL 2 , config 3 , cudaSupport ? config.cudaSupport, cudatoolkit ? null 4 }: ··· 20 ]; 21 22 buildInputs = [ 23 + opencv4 24 ] ++ lib.optional cudaSupport cudatoolkit 25 ++ lib.optional stdenv.isDarwin OpenCL 26 ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ];
+5 -5
pkgs/top-level/all-packages.nix
··· 24345 ffmpeg = ffmpeg_4; 24346 }; 24347 24348 - opencv3WithoutCuda = opencv3.override { 24349 - enableCuda = false; 24350 - }; 24351 - 24352 opencv4 = callPackage ../development/libraries/opencv/4.x.nix { 24353 inherit (darwin.apple_sdk.frameworks) 24354 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; 24355 pythonPackages = python3Packages; 24356 ffmpeg = ffmpeg_4; 24357 }; 24358 24359 opencv = opencv4; ··· 39806 caffe = callPackage ../applications/science/math/caffe ({ 39807 inherit (config) cudaSupport; 39808 cudaPackages = cudaPackages_10_1; 39809 - opencv3 = opencv3WithoutCuda; # Used only for image loading. 39810 blas = openblas; 39811 inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; 39812 } // (config.caffe or {}));
··· 24345 ffmpeg = ffmpeg_4; 24346 }; 24347 24348 opencv4 = callPackage ../development/libraries/opencv/4.x.nix { 24349 inherit (darwin.apple_sdk.frameworks) 24350 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; 24351 pythonPackages = python3Packages; 24352 ffmpeg = ffmpeg_4; 24353 + }; 24354 + 24355 + opencv4WithoutCuda = opencv4.override { 24356 + enableCuda = false; 24357 }; 24358 24359 opencv = opencv4; ··· 39806 caffe = callPackage ../applications/science/math/caffe ({ 39807 inherit (config) cudaSupport; 39808 cudaPackages = cudaPackages_10_1; 39809 + opencv4 = opencv4WithoutCuda; # Used only for image loading. 39810 blas = openblas; 39811 inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; 39812 } // (config.caffe or {}));