From f1d3f6b2ca2617d770c7ef1c32dbdfddd186c958 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Thu, 5 Nov 2020 20:50:18 +0900 Subject: [PATCH 1/2] 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> --- pkgs/development/libraries/opencv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 0749ec9e7f3..67c00839b35 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -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 = From ce438bd47196ca61fa2b0ffd4757495d8b12d1fb Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Mon, 9 Nov 2020 21:12:54 +0900 Subject: [PATCH 2/2] opencv: unbreak 2.4.13.7 Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/development/libraries/opencv/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 67c00839b35..56414cfa397 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -87,6 +87,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = true; }; }