summary refs log tree commit diff
path: root/nixos/doc/manual/release-notes/rl-2111.section.md
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-09-27 13:57:14 +0000
committerAlyssa Ross <hi@alyssa.is>2021-09-29 13:39:52 +0000
commitd69583c6c26551d30e7dac024fb83a65e13e1f65 (patch)
tree55f0b1ef7f1524bc32e83e6b9939c94dd7fa5ef5 /nixos/doc/manual/release-notes/rl-2111.section.md
parent0d19d263fec7af94c70f109fd4741444bc0616d4 (diff)
downloadnixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar.gz
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar.bz2
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar.lz
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar.xz
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.tar.zst
nixpkgs-d69583c6c26551d30e7dac024fb83a65e13e1f65.zip
opencv2: don't build unfree libraries by default
In opencv 2.x, unfree libraries are built by default.  The package
should therefore have been marked as unfree, but wasn't.

I've disabled the non-free libraries by default, and added an option
to enable them.  There are three programs in Nixpkgs that depend on
opencv2: mathematica, pfstools, and p2pvc.  pfstools requires the
non-free libraries if it's built with opencv support, so I've disabled
opencv by default there and added an option to enable it.  p2pvc links
fine, so presumably doesn't need the non-free libraries.  I can't test
mathematica, so I'm just going to leave it alone.
Diffstat (limited to 'nixos/doc/manual/release-notes/rl-2111.section.md')
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index ebc200c4ad5..56babf8ac00 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -331,6 +331,8 @@ In addition to numerous new and upgraded packages, this release has the followin
   respectively. As a result `services.datadog-agent` has had breaking changes to the
   configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst).
 
+- `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default.  Both packages now support an `enableUnfree` option to re-enable this functionality.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}