Skip to content

Commit 5c05bac

Browse files
committed
haskellPackages.opencv{,-extra}: remove overrides
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)
1 parent 1c607f6 commit 5c05bac

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

pkgs/development/haskell-modules/configuration-common.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -605,10 +605,6 @@ self: super: {
605605
focuslist = dontCheck super.focuslist;
606606
search = dontCheck super.search;
607607

608-
# see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
609-
opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv);
610-
opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra);
611-
612608
# https://github.com/ekmett/structures/issues/3
613609
structures = dontCheck super.structures;
614610

pkgs/development/haskell-modules/configuration-nix.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,9 +685,6 @@ self: super: builtins.intersectAttrs super {
685685
liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
686686
liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
687687

688-
# Without this override, the builds lacks pkg-config.
689-
opencv-extra = addPkgconfigDepend pkgs.opencv3 super.opencv-extra;
690-
691688
# Break cyclic reference that results in an infinite recursion.
692689
partial-semigroup = dontCheck super.partial-semigroup;
693690
colour = dontCheck super.colour;

pkgs/development/haskell-modules/patches/opencv-fix-116.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)