Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskellPackages.{ffmpeg-light,opencv{,-extra}}: remove overrides #336110

Merged
merged 2 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 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 Expand Up @@ -2865,10 +2861,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;

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 @@ -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;
Expand Down
11 changes: 0 additions & 11 deletions pkgs/development/haskell-modules/patches/opencv-fix-116.patch

This file was deleted.