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: a805b2ea32d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13b5c8a4db3a
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2020

  1. opencv: 2.4.13 -> 2.4.13.7 

    It updates the repository URL to opencv/opencv. opencv2, p2pvc and
pfstools are built without errors but not really tested.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
    @omasanori
    omasanori committed Nov 5, 2020
    Copy the full SHA
    f1d3f6b View commit details

Commits on Nov 9, 2020

  1. opencv: unbreak 2.4.13.7 

    Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
    @omasanori
    omasanori committed Nov 9, 2020
    Copy the full SHA
    ce438bd View commit details

Commits on Nov 11, 2020

  1. Merge pull request #102918 from omasanori/opencv/update-2.4.13.7 

    opencv: 2.4.13 -> 2.4.13.7
    @Ma27
    Ma27 authored Nov 11, 2020
    Copy the full SHA
    13b5c8a View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 pkgs/development/libraries/opencv/default.nix
7 changes: 3 additions & 4 deletions pkgs/development/libraries/opencv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@ in

stdenv.mkDerivation rec {
pname = "opencv";
version = "2.4.13";
version = "2.4.13.7";

src = fetchFromGitHub {
owner = "Itseez";
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh";
sha256 = "062js7zhh4ixi2wk61wyi23qp9zsk5vw24iz2i5fab2hp97y5zq3";
};

patches =
@@ -87,6 +87,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
broken = true;
};
}