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

[master] haskellPackages.{ffmpeg-light,opencv{,-extra}}: remove overrides #336675

Merged
merged 2 commits into from
Aug 23, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Aug 23, 2024

Description of changes

Backport of #336110. Should fix eval on master. Sorry about this, I didn’t do adequate checking that the references were sufficiently lazy for this to be safe when splitting up the PR.

I don’t think this should cause any issues for haskell-updates as the commits are a verbatim match between both branches and the two packages these are overrides for are both marked as broken anyway so the overrides were dead code beforehand. If I’m wrong and this does cause any issues for haskell-updates, I promise I will do my best to do whatever is necessary to resolve them.

The alternative, if touching these files on master is absolutely verboten, is to revert #336141 until the next haskell-updates cycle.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

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:
<acowley/ffmpeg-light#72>.

(cherry picked from commit 7ce990f)
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)
@emilazy emilazy requested a review from maralorn August 23, 2024 03:19
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 23, 2024
@K900 K900 merged commit 7bc08d0 into NixOS:master Aug 23, 2024
26 checks passed
@emilazy emilazy deleted the push-wnvwrzlnlunk branch August 26, 2024 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: haskell 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants