cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #267446 from mweinelt/frigate-opencv-relax

Browse source 
frigate: drop opencv pin
This commit is contained in:
Martin Weinelt 2023-11-15 00:06:06 +01:00 committed by GitHub
commit 07adfe6112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/video/frigate/default.nix
View file

@ -5,7 +5,6 @@
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, frigate , frigate
, opencv4
, nixosTests , nixosTests
}: }:
@ -26,28 +25,6 @@ let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
# https://github.com/blakeblackshear/frigate/blob/v0.12.0/requirements-wheels.txt#L7
opencv = super.toPythonModule ((opencv4.override {
enablePython = true;
pythonPackages = self;
}).overrideAttrs (oldAttrs: rec {
version = "4.5.5";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = "refs/tags/${version}";
hash = "sha256-TJfzEAMh4JSshZ7oEZPgB59+NBACsj6Z5TCzVOBaEP4=";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = "refs/tags/${version}";
hash = "sha256-skuH9GYg0mivGaJjxbggXk4x/0bbQISrAawA3ZUGfCk=";
};
postUnpack = ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
'';
}));
}; };
}; };
@ -129,7 +106,7 @@ python.pkgs.buildPythonApplication rec {
imutils imutils
matplotlib matplotlib
numpy numpy
opencv opencv4
openvino openvino
paho-mqtt paho-mqtt
peewee peewee