Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf5e3c24d0d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0bc377d47deb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 15, 2019

  1. opencv: 4.0.1 -> 4.1.0

    @basvandijk
    basvandijk committed Jun 15, 2019
    Copy the full SHA
    baf54b6 View commit details

Commits on Jun 16, 2019

  1. Merge pull request #63160 from basvandijk/opencv-4.1.0 

    opencv: 4.0.1 -> 4.1.0
    @basvandijk
    basvandijk authored Jun 16, 2019
    Copy the full SHA
    0bc377d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/opencv/4.x.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/opencv/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -35,20 +35,20 @@
}:

let
version = "4.0.1";
version = "4.1.0";

src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48";
sha256 = "0m1f51m11iz4vxfrmnhawksd669ld247rlfdq5fhkvfk3r7aidw6";
};

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

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