Skip to content

Commit

Permalink
haskellPackages.opencv{,-extra}: remove overrides
Browse files Browse the repository at this point in the history
These packages have been broken since before the 24.05 release. There
is a pull request open to update them to a newer OpenCV and get them
working again: <LumiGuide/haskell-opencv#157>.

(cherry picked from commit 79872e0)
  • Loading branch information
emilazy authored and RCoeurjoly committed Aug 23, 2024
1 parent 3aa7816 commit 37f38ae
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 18 deletions.
4 changes: 0 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -605,10 +605,6 @@ self: super: {
focuslist = dontCheck super.focuslist;
search = dontCheck super.search;

# see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv);
opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra);

# https://github.com/ekmett/structures/issues/3
structures = dontCheck super.structures;

Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,6 @@ self: super: builtins.intersectAttrs super {
liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);

# Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend pkgs.opencv3 super.opencv-extra;

# Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup;
colour = dontCheck super.colour;
Expand Down
11 changes: 0 additions & 11 deletions pkgs/development/haskell-modules/patches/opencv-fix-116.patch

This file was deleted.

0 comments on commit 37f38ae

Please sign in to comment.