nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 20:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
566,859 Commits 185 Branches 125 Tags 6.1 GiB
0552586e26
Commit Graph

213 Commits

Author SHA1 Message Date
Someone
e326909cf3
opencv4: extend the comment about cxxdev 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2023-12-25 22:10:11 +00:00
Someone Serge
7954fc68cb
opencv4: propagate real outputs in cxxdev even without cuda 
Hotfix https://github.com/NixOS/nixpkgs/issues/276691
 2023-12-25 11:56:37 +00:00
Someone Serge
55af932942
opencv4: discard build-time cuda deps 2023-12-06 02:00:52 +00:00
Someone Serge
4569838029
opencv4: propagate optical flow sdk same as cuda 2023-12-06 02:00:52 +00:00
Someone Serge
ada3991349
opencv4: expose cxxdev, propagating optional cuda deps 2023-12-06 02:00:52 +00:00
Someone Serge
0c4b1fcfba
openvino: opencvConfig.cmake attempts to find_package(CUDA) 2023-12-04 20:24:32 +00:00
Fabián Heredia Montiel
884449105e Merge remote-tracking branch 'origin/master' into staging-next 2023-11-13 14:31:51 -06:00
Someone Serge
d4229c0e32
opecv4: drop symlinkJoin 2023-11-03 13:34:48 +00:00
Someone Serge
866daf5f7c
opencv{3,4}: do not ignore config.cudaSupport 
i686 isn't in the meta.platforms for cudaPackages anyway
 2023-11-02 19:13:31 +00:00
Someone Serge
c7dbb3ccc9
opencv3: cuda: add a libstdc++ integration test 2023-11-02 19:13:31 +00:00
Someone Serge
4735963a24
opencv4: cuda: fix libstdc++ errors 2023-11-02 19:13:31 +00:00
Someone Serge
a122884cb3
opencv4: cuda: add a libstdc++ integration test 2023-11-02 19:13:31 +00:00
Aaron Jheng
80aaa46d4c
protobuf: use new package definition only 2023-10-11 13:20:31 +00:00
Pierre Bourdon
5266b96d2e
Merge pull request #256444 from delroth/opencv-darwin-unvendor 
opencv3,opencv4: disable some unnecessary vendoring on Darwin
 2023-09-27 23:23:45 +02:00
Pierre Bourdon
c32c0dd64a
opencv3,opencv4: disable some unnecessary vendoring on Darwin 2023-09-22 00:59:41 +02:00
Ben Darwin
38a5ede5c3 opencv3: remove enableVtk flag 
This flag does not actually cause opencv3 to detect vtk.
Instead of fixing it, we remove it to remove the optional dependence on
vtk_8.
(Note this flag works correctly in opencv4.)
 2023-09-18 12:45:56 -04:00
Vladimír Čunát
bb945f3cea
opencv(4), opencv3: switch to older protobuf 
https://hydra.nixos.org/build/231540730
https://hydra.nixos.org/build/231464517
 2023-08-15 07:55:47 +02:00
Connor Baker
495875182e
Merge pull request #224068 from SomeoneSerge/respect-config-cudaSupport 
Respect global config.cudaSupport
 2023-07-25 14:18:14 -04:00
Someone Serge
471dbe9bcf
treewide: consume config.cudaSupport as required 
Eliminate uses of `config.cudaSupport or false` and alike, since the
option is now declared in config.nix with a default value

fd .nix -t f -x sed 's/config\.cudaSupport or false, cudaPackages [?] [{][}]/config.cudaSupport, cudaPackages ? { }/' '{}' -i
fd .nix -t f -x sed 's/config\.cudaSupport or false/config.cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = pkgs.config.cudaSupport/inherit (pkgs.config) cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = config.cudaSupport/inherit (config) cudaSupport/' '{}' -i
 2023-07-20 18:08:19 +03:00
Felix Buehler
f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
Robert Scott
0c813b2340 opencv: add patches for CVE-2023-2617 & CVE-2023-2618 2023-05-31 22:12:42 +01:00
fetsorn
d454823d20 opencv: fix typo 
"perfomanceTests" -> "performanceTests"
 2023-05-08 22:11:18 +04:00
Vladimír Čunát
c6b639ec35
opencv2: add Accelerate framework on darwin 
Same as commit e4d2b6fced3; I didn't notice this version suffered
from it as well.  It's probably random/impurity anyway.
https://hydra.nixos.org/build/214981496
 2023-04-10 08:24:42 +02:00
Vladimír Čunát
e4d2b6fced
opencv_{3,4}: add Accelerate framework on darwin 
No idea why aarch64-darwin started to need it now.
https://hydra.nixos.org/build/215252174#tabs-buildsteps
(also split long lines)
 2023-04-09 08:21:09 +02:00
Samuel Ainsworth
2cc30d5125
Merge pull request #221370 from ConnorBaker/feat/opencv-use-cudaPackages-staging-reland 
opencv: misc CUDA-related updates and fixes; add enableLto
 2023-03-29 21:36:52 -04:00
Connor Baker
cd16931110 opencv: use cudaPackages.backendStdenv.cc instead of cudaPackages.cudatoolkit.cc 2023-03-17 10:17:50 -04:00
Connor Baker
a418cae499 opencv: misc CUDA-related updates and fixes; add enableLto 
- use cudaPackages instead of cudatoolkit (reduces download/closure size)
- set C/C++ compiler when building with CUDA to ensure NVCC has an appropriate backing compiler
- add flag to build with CUDNN (disabled by default due to increase in closure size)
- add flag to build with LTO (enabled by default)
 2023-03-15 19:59:12 +00:00
Mathieu Rene
e4c31c2dfc opencv3: Build with video input under darwin platforms 
Adds the right dependencies for encoding video, and removes the cmake
flag preventing the feature to be compiled in.
 2023-03-12 16:15:14 -04:00
Enno Richter
649670296e opencv2: add darwin dependencies 2023-03-07 05:32:02 +01:00
Someone Serge
2b69d618c2
opencv3: respect config.cudaCapabilities 2023-03-04 01:04:25 +02:00
Someone Serge
d378cc6fb2
opencv4: respect config.cudaCapabilities 
This is needed for faster builds when debugging the opencv derivation,
and it's more consistent with other cuda-enabled packages

-DCUDA_GENERATION seems to expect architecture names, so we refactor
cudaFlags to facilitate easier extraction of the configured archnames
 2023-03-04 00:59:21 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset 
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
 2023-02-22 21:23:04 +02:00
github-actions[bot]
bc833a50cc
Merge master into staging-next 2023-02-05 00:02:31 +00:00
Ben Darwin
5a8562ac9f opencv4: unpin vtk 2023-02-04 12:04:17 -05:00
Artturi
d05e08940f
Merge pull request #208351 from gbtb/opencv4_tests_and_blas_provider 2023-01-28 17:58:00 +02:00
Ben Darwin
4095b8232c vtk, vtkWithQt5: bump from vtk_8 to vtk_9 2023-01-24 12:33:48 -05:00
gbtb
66efeba677 opencv4: using blas provider, fixed multi-threading conflict between opencv and openblas 2023-01-10 05:51:34 +02:00
gbtb
ddd340c59b opencv4: added accuracy and performance tests 
removed mdaiter from maintainers, his last PR in nixpkgs was in 2017
 2023-01-10 05:51:34 +02:00
Artturin
72c7d7c27e opencv4: add reverse deps to tests 2022-12-29 15:26:58 +02:00
Artturin
021eed6b75 opencv: 4.6.0 -> 4.7.0 
https://github.com/opencv/opencv/releases/tag/4.7.0
 2022-12-28 21:33:16 +02:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list 
the argument to optional should not be list
 2022-10-10 15:40:21 +03:00
Yureka
d948d26a97
opencv3: 3.4.15 -> 3.4.18 2022-09-23 01:31:13 +02:00
Yureka
595ed0ec11 opencv: 4.5.4 -> 4.6.0 2022-09-21 13:08:28 +02:00
Robert Scott
cfca7fe857
Merge pull request #182893 from kevinmehall/opencv-openjpeg 
opencv: Use OpenJPEG from nixpkgs instead of vendored copy
 2022-07-27 21:55:50 +01:00
Kevin Mehall
b21e1b5d1a opencv: Use OpenJPEG from nixpkgs instead of vendored copy 2022-07-26 16:46:39 -07:00
Artturin
1bd8727a4c various: enable gobject-introspection when cross-compiling 
and fix cross in some
 2022-07-08 03:56:47 +03:00
Sandro
c0fb2f569f
Merge pull request #170271 from armeenm/opencv-remove-python2 
opencv2: remove python2 option
 2022-06-17 13:34:39 +02:00
Rick van Schijndel
aa9f72b92b opencv4: disable hdf5 for cross-compilation 
This gets us as far as building opencv, but it doesn't completely build yet
 2022-06-02 22:53:41 +02:00
Armeen Mahdian
9a73a65fc2 opencv2: remove python2 option 2022-04-25 10:00:19 -05:00
Robert Schütz
d5cceedbd1 python,pythonPackages: make aliases 
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
 2022-01-16 18:39:59 +00:00