From 5c05bac47f2495cf0d5e5205cb1cf3a73701c23c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 17:50:05 +0100 Subject: [PATCH] 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: . (cherry picked from commit 79872e05394ca417d45ab1cd75eed4e2e09101d9) --- .../haskell-modules/configuration-common.nix | 4 ---- .../development/haskell-modules/configuration-nix.nix | 3 --- .../haskell-modules/patches/opencv-fix-116.patch | 11 ----------- 3 files changed, 18 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/opencv-fix-116.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fe50f572b38c8..1419ab9f5ed66 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6bb7bba1f8e98..5d668f49ba722 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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; diff --git a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch b/pkgs/development/haskell-modules/patches/opencv-fix-116.patch deleted file mode 100644 index bf89d8daf9fcf..0000000000000 --- a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch +++ /dev/null @@ -1,11 +0,0 @@ -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'