pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #260727 from bcdarwin/opencv-python-updates

python310Packages.opencv3: remove

authored by

Mario Rodas and committed by
GitHub 05d4a386 c95728ce

+24 -29
+2 -2
pkgs/development/python-modules/bpycv/default.nix
··· 9 9 , fetchPypi 10 10 , fetchurl 11 11 , minexr 12 - , opencv3 12 + , opencv4 13 13 , python3Packages 14 14 , requests 15 15 , runCommand ··· 32 32 minexr 33 33 zcs 34 34 requests 35 - opencv3 35 + opencv4 36 36 boxx 37 37 ]; 38 38
+8 -5
pkgs/development/python-modules/camelot/default.nix
··· 10 10 , pandas 11 11 , tabulate 12 12 , click 13 - , pdfminer 13 + , pdfminer-six 14 14 , pypdf 15 - , opencv3 15 + , opencv4 16 + , setuptools 16 17 }: 17 18 18 19 buildPythonPackage rec { 19 20 pname = "camelot-py"; 20 21 version = "0.11.0"; 21 - format = "setuptools"; 22 + pyproject = true; 22 23 23 24 disabled = pythonOlder "3.7"; 24 25 ··· 27 28 hash = "sha256-l6fZBtaF5AWaSlSaY646UfCrcqPIJlV/hEPGWhGB3+Y="; 28 29 }; 29 30 31 + nativeBuildInputs = [ setuptools ]; 32 + 30 33 propagatedBuildInputs = [ 31 34 charset-normalizer 32 35 chardet 33 36 pandas 34 37 tabulate 35 38 click 36 - pdfminer 39 + pdfminer-six 37 40 openpyxl 38 41 pypdf 39 - opencv3 42 + opencv4 40 43 ]; 41 44 42 45 doCheck = false;
+2 -2
pkgs/development/python-modules/easyocr/default.nix
··· 4 4 , hdf5 5 5 , numpy 6 6 , onnx 7 - , opencv3 7 + , opencv4 8 8 , pillow 9 9 , pyaml 10 10 , pyclipper ··· 40 40 propagatedBuildInputs = [ 41 41 hdf5 42 42 numpy 43 - opencv3 43 + opencv4 44 44 pillow 45 45 pyaml 46 46 pyclipper
+2 -2
pkgs/development/python-modules/imagecorruptions/default.nix
··· 3 3 , numpy 4 4 , scikit-image 5 5 , lib 6 - , opencv3 6 + , opencv4 7 7 }: 8 8 9 9 buildPythonPackage rec { ··· 23 23 propagatedBuildInputs = [ 24 24 numpy 25 25 scikit-image 26 - opencv3 26 + opencv4 27 27 ]; 28 28 29 29 doCheck = false;
+4 -6
pkgs/development/python-modules/imantics/default.nix
··· 2 2 , fetchFromGitHub 3 3 , lib 4 4 , numpy 5 - , opencv3 6 - , sphinx-rtd-theme 5 + , opencv4 7 6 , lxml 8 7 , xmljson 8 + , pytestCheckHook 9 9 }: 10 10 11 11 buildPythonPackage rec { ··· 21 21 22 22 propagatedBuildInputs = [ 23 23 numpy 24 - opencv3 25 - sphinx-rtd-theme 24 + opencv4 26 25 lxml 27 26 xmljson 28 27 ]; ··· 32 31 --replace "'opencv-python>=3'," "" 33 32 ''; 34 33 35 - # failing on NixOS 36 - doCheck = false; 34 + nativeCheckInputs = [ pytestCheckHook ]; 37 35 38 36 pythonImportsCheck = [ "imantics" ]; 39 37
+2 -2
pkgs/development/python-modules/imutils/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , opencv3 4 + , opencv4 5 5 }: 6 6 7 7 buildPythonPackage rec { ··· 13 13 sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24"; 14 14 }; 15 15 16 - propagatedBuildInputs = [ opencv3 ]; 16 + propagatedBuildInputs = [ opencv4 ]; 17 17 18 18 # no tests 19 19 doCheck = false;
-2
pkgs/development/python-modules/moviepy/default.nix
··· 11 11 , tqdm 12 12 # Advanced image processing (triples size of output) 13 13 , advancedProcessing ? false 14 - , opencv3 15 14 , scikit-image 16 15 , scikit-learn 17 16 , scipy ··· 47 46 requests 48 47 proglog 49 48 ] ++ lib.optionals advancedProcessing [ 50 - opencv3 51 49 scikit-image 52 50 scikit-learn 53 51 scipy
+3 -2
pkgs/development/python-modules/stytra/default.nix
··· 15 15 , nose 16 16 , numba 17 17 , numpy 18 - , opencv3 18 + , opencv4 19 19 , pandas 20 20 , pims 21 21 , pyqt5 ··· 48 48 ''; 49 49 50 50 propagatedBuildInputs = [ 51 - opencv3 51 + opencv4 52 52 pyqt5 53 53 pyqtgraph 54 54 numpy ··· 84 84 homepage = "https://github.com/portugueslab/stytra"; 85 85 license = licenses.gpl3Plus; 86 86 maintainers = with maintainers; [ tbenst ]; 87 + broken = true; # incompatible with pyqtgraph>0.13.0: https://github.com/portugueslab/stytra/issues/87 87 88 }; 88 89 }
-1
pkgs/top-level/all-packages.nix
··· 34238 34238 shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; 34239 34239 34240 34240 shogun = callPackage ../applications/science/machine-learning/shogun { 34241 - opencv = opencv3; 34242 34241 protobuf = protobuf3_21; 34243 34242 }; 34244 34243
+1
pkgs/top-level/python-aliases.nix
··· 248 248 Nuitka = nuitka; # added 2023-02-19 249 249 ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; 250 250 openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 251 + opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12 251 252 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 252 253 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 253 254 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
-5
pkgs/top-level/python-packages.nix
··· 8451 8451 8452 8452 opencontainers = callPackage ../development/python-modules/opencontainers { }; 8453 8453 8454 - opencv3 = toPythonModule (pkgs.opencv3.override { 8455 - enablePython = true; 8456 - pythonPackages = self; 8457 - }); 8458 - 8459 8454 opencv4 = toPythonModule (pkgs.opencv4.override { 8460 8455 enablePython = true; 8461 8456 pythonPackages = self;