diff options
| author | Yureka <yuka@yuka.dev> | 2022-09-23 01:31:13 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2022-09-23 01:31:13 +0200 |
| commit | d948d26a97dafde706cf1c1aef7ceb3f20981ccb (patch) | |
| tree | 41089e4c27ef27ac2dbe9d7497da1a0a04121a6b /pkgs/development/libraries/opencv | |
| parent | 595ed0ec110db51a49c77fabb109bf92de898976 (diff) | |
| download | nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar.gz nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar.bz2 nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar.lz nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar.xz nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.tar.zst nixpkgs-d948d26a97dafde706cf1c1aef7ceb3f20981ccb.zip | |
opencv3: 3.4.15 -> 3.4.18
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 00c595d1d2d..550a7f39373 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -40,20 +40,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - version = "3.4.15"; + version = "3.4.18"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc="; + hash = "sha256-PgwAZNoPknFT0jCLt3TCzend6OYFY3iUIzDf/FptAYA="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg="; + hash = "sha256-TEF/GHglOmsshlC6q4iw14ZMpvA0SaKwlidomAN+sRc="; }; # Contrib must be built in order to enable Tesseract support: @@ -155,11 +155,6 @@ stdenv.mkDerivation { # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch - # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. - (fetchpatch { - url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; - sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; - }) ]; # This prevents cmake from using libraries in impure paths (which |