From 7ce990f1d22cbe89f71155026e26f758b3f18499 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 17:50:05 +0100 Subject: [PATCH 1/2] haskellPackages.ffmpeg-light: remove override This package has been marked as broken for a year. If anyone wants to fix it, there is a pull request updating it to the current FFmpeg API: . --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 478838c720903..fe50f572b38c8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2865,10 +2865,6 @@ self: super: { editedCabalFile = null; }) super.true-name); - # ffmpeg-light works against the ffmpeg-4 API, but the default ffmpeg in nixpkgs is ffmpeg-5. - # https://github.com/NixOS/nixpkgs/pull/220972#issuecomment-1484017192 - ffmpeg-light = super.ffmpeg-light.override { ffmpeg = pkgs.ffmpeg_4; }; - # 2024-08-15: primitive >=0.9 && <0.10 posix-api = doJailbreak super.posix-api; From 79872e05394ca417d45ab1cd75eed4e2e09101d9 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 17:50:05 +0100 Subject: [PATCH 2/2] 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: . --- .../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 922bf1d601b6e..eeacccc793424 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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; 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'