Merge pull request #336141 from emilazy/push-uztymzmukyyk

opencv{2,3}: drop
NixOS · Aug 22, 2024 · 11b26f0 · 11b26f0
2 parents 634197d + 87c5a23
commit 11b26f0
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 895 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -326,6 +326,10 @@
 
 - The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`.
 
+- `opencv2` and `opencv3` have been removed, as they are obsolete and
+  were not used by any other package. External users are encouraged to
+  migrate to OpenCV 4.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   bambu-studio,
-  opencv2,
+  opencv,
 }:
 bambu-studio.overrideAttrs (
   finalAttrs: previousAttrs: {
@@ -28,7 +28,7 @@ bambu-studio.overrideAttrs (
     buildInputs =
       previousAttrs.buildInputs
       ++ [
-        opencv2
+        opencv
       ];
 
     preFixup = ''

diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix