Commit 79872e05 authored by Emily's avatar Emily
Browse files

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: <https://github.com/LumiGuide/haskell-opencv/pull/157>.
parent 7ce990f1

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

+0 −4
Original line number Diff line number Diff line
@@ -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;

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

+0 −3
Original line number Diff line number Diff line
@@ -683,9 +683,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;

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

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs

--- opencv-0.0.2.1.bak/Setup.hs	2018-11-10 17:18:41.355731189 +0100

+++ opencv-0.0.2.1/Setup.hs	2018-11-10 17:18:56.901681162 +0100

@@ -3,6 +3,6 @@

 

 main = do

     args <- getArgs

-    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]

+    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"]

               | otherwise               = args

     defaultMainArgs args'