Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c9a249b0133
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de1c582f3d5a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 7, 2019

  1. opencv3: 3.4.5 -> 3.4.8 (security) 

    addressing CVE-2019-14491, CVE-2019-14492 & CVE-2019-15939

all internal downloads are unchanged for this release

(cherry picked from commit a38ee9f002a36c323b5facd19dcecf65274562c0 & adapted)
    @risicle
    risicle committed Nov 7, 2019
    Copy the full SHA
    327ecc2 View commit details

Commits on Nov 8, 2019

  1. Merge pull request #73010 from risicle/ris-opencv-3.4.8-r19.03 

    [r19.03] opencv3: 3.4.5 -> 3.4.8, addressing CVE-2019-14491, CVE-2019-14492 & CVE-2019-15939
    @basvandijk
    basvandijk authored Nov 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de1c582 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/opencv/3.x.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/opencv/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -35,20 +35,20 @@
}:

let
version = "3.4.5";
version = "3.4.8";

src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc";
sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp";
};

contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h";
sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i";
};

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