diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-09-03 12:38:50 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-09-03 12:38:50 +0200 |
commit | 252c0d4c82b70ede96cb669485f78aaa99400921 (patch) | |
tree | 23b024d61fc561548ab480c2d98bc6ceca7fdf80 /pkgs | |
parent | 185f0015f230a26bbd1fdea156e5ea6fbb2f288a (diff) | |
download | nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar.gz nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar.bz2 nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar.lz nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar.xz nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.tar.zst nixlib-252c0d4c82b70ede96cb669485f78aaa99400921.zip |
opencv: 3.4.2 -> 3.4.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/opencv/fix-dnn.patch | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 81d106a2a40c..dd87fa932604 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -35,20 +35,20 @@ }: let - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx"; + sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz"; + sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2"; }; # Contrib must be built in order to enable Tesseract support: @@ -145,11 +145,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; - # TODO: remove the following patch once commit - # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f - # is released. - patches = [ ./fix-dnn.patch ]; - # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch deleted file mode 100644 index 62234a43e461..000000000000 --- a/pkgs/development/libraries/opencv/fix-dnn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index 730c752ce..abbce0453 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { - std::ifstream fs(filename, std::ifstream::in); - CHECK(fs.is_open()) << "Can't open \"" << filename << "\""; - IstreamInputStream input(&fs); -- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto); -+ return google::protobuf::TextFormat::Parser().Parse(&input, proto); - } - - bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { |