nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-15 03:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,058,993 Commits 469 Branches 81 Tags
python-updates
Commit Graph

140 Commits

Author SHA1 Message Date
K900
1fa22668e4 opencv: pin ffmpeg 8 2026-08-08 13:57:01 +03:00
夜坂雅
e589763ae0 opencv4: drop gtk2 support for highgui 2026-07-25 09:18:27 +08:00
Emily
6472ba3a88 Revert "opencv: work around ld64 hardening issue" 
The ld64 issue has been fixed.

This reverts commit 8f2f727a67.
 2026-07-15 03:26:25 +01:00
Niklas Hambüchen
0473ed3fb0 opencv: Add JPEG-XL support 2026-07-13 17:17:50 +00:00
Emily
8f2f727a67 opencv: work around ld64 hardening issue 2026-07-04 15:47:39 +01:00
Michael Daniels
4d86f2810e Merge branch 'staging-next' into staging 2026-06-21 22:23:20 -04:00
Gaetan Lepage
3fecd68e9d cudaPackages_13_3.cccl: init at 13.3.3.3.1 2026-06-21 16:56:43 +00:00
nixpkgs-ci[bot]
afcb4734bf Merge staging-next into staging 2026-05-29 00:47:08 +00:00
Gaetan Lepage
e04155ad59 opencv: fix on cuda 13.2 2026-05-28 20:36:07 +00:00
Robert Schütz
e38a2c4175 opencv4: use ffmpeg-headless 2026-05-27 07:21:28 -07:00
Stefan Frijters
f6d7a099be opencv: move env variables into env for structuredAttrs 2026-02-28 12:09:18 +01:00
Gaetan Lepage
b12877ea0d opencv: 4.12.0 -> 4.13.0 
Diff: https://github.com/opencv/opencv/compare/4.12.0...4.13.0

Changelog:
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4130
 2026-02-01 16:00:01 +00:00
nixpkgs-ci[bot]
6e6f059b57 Merge staging-next into staging 2025-12-08 12:08:02 +00:00
Stefan Frijters
9c9668ade4 opencv: fix hardcoded source path 
This should fix builds for non-default fetchedSourceNameDefault and is a no-op for the default.
 2025-12-06 13:38:20 +01:00
Ben Siraphob
ef4136c4f5 opencv: backport upstream fix for reproducible builds 2025-12-05 17:04:37 -08:00
Vladimír Čunát
38ab204bb0 Merge branch 'staging' into staging-next 2025-11-14 10:39:13 +01:00
Martin Weinelt
3ff27f679d opencv: update contrib and test data (#459592) 2025-11-12 20:52:31 +00:00
Martin Weinelt
2af4c082a8 opencv: update contrib and test data 
This was missed during the 4.12 update and didn't stand out while testing
the update.
 2025-11-07 23:03:41 +01:00
jopejoe1
9a13b5860a opencv: support building with ffmpeg 8 2025-10-29 23:26:59 +01:00
Jo
185e3d623c ffmpeg: switch default to ffmpeg_8 (#450436) 2025-10-25 04:31:00 +00:00
jopejoe1
f155a3942c opencv: pin to ffmpeg_7 2025-10-09 22:52:31 +02:00
Wolfgang Walther
5e1f5b623b Merge branch 'staging-next' into staging 2025-10-05 11:40:56 +02:00
K900
e93c560b79 Merge remote-tracking branch 'origin/master' into staging-next 2025-10-05 12:17:08 +03:00
Wolfgang Walther
91a8fee3aa treewide: remove redundant parentheses 
Auto-fixed by nixf-diagnose.
 2025-10-05 10:52:03 +02:00
Connor Baker
a1180e40d3 opencv: invalidate Nix store paths used in version_string.inc 
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
 2025-09-18 13:27:13 -07:00
Emily
f2b94e3da0 treewide: tbb -> onetbb 2025-09-15 17:29:35 +01:00
Martin Weinelt
3b2289cfb6 opencv: 4.11.0 -> 4.12.0 
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4120
https://github.com/opencv/opencv/compare/4.11.0...4.12.0
 2025-09-04 02:36:48 +02:00
Wolfgang Walther
90604d95bc Merge branch 'staging-next' into staging 2025-07-24 14:33:09 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Philip Taron
688b2a5f1b opencv4: protobuf_21 -> protobuf (#419335) 2025-07-17 06:38:17 -07:00
Melody Kelly
3eb8b879ac opencv: use c++ 17 to fix protobuf support 
fixes #386327

(cherry picked from commit fbced4e70d)
 2025-07-01 07:55:11 -07:00
Connor Baker
a243001622 opencv: use FindCudaToolkit module in CMake config 
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
 2025-06-24 23:31:35 +00:00
Connor Baker
8b38ae2466 Revert "opencv: export CUDA_TOOLKIT_ROOT_DIR so findCUDA uses Nix-selected toolkit" 
This reverts commit 9bb1700d79.

Packages should use `opencv.cxxdev` to bring in OpenCV's C++ dev files.
 2025-06-24 23:30:56 +00:00
Connor Baker
b5daea748f opencv4: protobuf_21 -> protobuf 
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
 2025-06-23 18:02:48 +00:00
mtc
9bb1700d79 opencv: export CUDA_TOOLKIT_ROOT_DIR so findCUDA uses Nix-selected toolkit 
opencv: condensed comments
 2025-06-07 01:45:42 -04:00
Connor Baker
4938f79c95 tree-wide: cudaPackages.cudaFlags -> cudaPackages.flags 
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
 2025-05-12 19:36:34 +00:00
nixpkgs-ci[bot]
3e46fb5876 Merge master into staging-next 2025-04-25 14:20:47 +00:00
Emily
9e75b25653 opencv4: revert Darwin SDK workaround 
No longer necessary.

This partially reverts commit 12f58047cd.
 2025-04-23 14:55:15 +01:00
Augustin Trancart
c312f6f818 opencv: fix protobuf support 
See https://github.com/opencv/opencv/blob/4.11.0/cmake/OpenCVFindProtobuf.cmake#L81

Only protobuf <= 22 will work with the current CXX standard version.
 2025-04-21 13:48:50 +02:00
Augustin Trancart
2b2a13782b opencv: switch to openexr_3 2025-04-21 13:48:48 +02:00
K900
5bde64c1c4 opencv4: reformat 2025-04-10 18:12:12 +03:00
K900
12f58047cd opencv4: remove old Darwin cruft, use SDK 14 
Same issue as Qt5.
 2025-04-10 17:17:20 +03:00
Audrey Dutcher
406efa0443 opencv: mark support for FreeBSD 2025-03-05 23:57:54 +01:00
Sandro Jäckel
4dc9948c81 opencv: format 2025-03-05 23:49:43 +01:00
Sandro Jäckel
32ad75bfe7 opencv: fix fallback which causes infinite recursion 2025-02-28 16:44:59 +01:00
Sandro Jäckel
22e9956a94 opencv: fix ade hash to fix gapi support 2025-02-28 16:44:00 +01:00
Sandro Jäckel
2eafee5fcd opencv: cleanup unused code 2025-02-28 16:43:51 +01:00
Peder Bergebakken Sundt
5aba99242e treewide: fix typos in comments 
Made with

```shell
git restore .
fd '\.nix$' pkgs/ --type f -j1 -x bash -xc "$(cat <<"EOF"
    typos --no-check-filenames --write-changes "$1"
    git diff --exit-code "$1" && exit
    #( git diff "$1" | grep -qE "^\+ +[^# ]") && git restore "$1"
    count1="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> ' | wc -l )"
    count2="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> (<span style="color:#f8f8f2;"> *</span>)?<span style="color:#75715e;">.*</span>$' | wc -l )"
    [[ $count1 -ne $count2 ]] && git restore "$1"
EOF
)" -- {}
```

and filtered with `GIT_DIFF_OPTS='--unified=15' git -c interactive.singleKey=true add --patch`

I initially tried using the tree-sitter cli, python bindings and even ast-grep through various means, but this is what I ended up with.
 2025-02-24 10:44:41 +01:00
Gaetan Lepage
7d50d46671 opencv: do not add withIpp to passthru.tests on darwin 2025-02-18 15:22:28 +01:00
Gaetan Lepage
688232dcd4 opencv: add missing hash for ipp support 2025-02-18 13:50:25 +01:00