diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-22 17:24:21 +0100 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-22 17:24:21 +0100 |
commit | b2ea55787933b1bd0e2807165e45ea56939758b2 (patch) | |
tree | 718f341084bb8596824cd7e7bbdafc3d711bfb22 /pkgs/development/libraries/opencv | |
parent | e0a64fbb7ce1893b39ebeff1f4018ae4f49a7192 (diff) | |
download | nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar.gz nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar.bz2 nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar.lz nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar.xz nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.tar.zst nixpkgs-b2ea55787933b1bd0e2807165e45ea56939758b2.zip |
opencv3: 3.4.4 -> 3.4.5
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 01d15416dd7..cca820e2f37 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.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr"; + sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib"; + sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h"; }; # Contrib must be built in order to enable Tesseract support: @@ -147,21 +147,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; - patches = [ - # https://github.com/opencv/opencv/pull/13232 - # This also fixes the test of haskell-opencv HEAD where we got the following error: - # libgomp: Out of memory allocating 927712937064 bytes - (fetchpatch { - url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch; - sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj"; - }) - ] ++ - # https://github.com/opencv/opencv/pull/13254 - lib.optional enablePython (fetchpatch { - url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch; - sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws"; - }); - # 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 |