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

Revert "nixos/frigate: provide ffmpeg-full for nvidia hw accel" #358709

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Nov 24, 2024

With #354952, the regular ffmpeg-headless should now have all the deps required for frigate to make use of hardware acceleration on all hardware.

This is progress towards #271863

This reverts commit 7e33e47.

This may be surprising as it's quite soon after
7e33e47 was merged but we decided in #357717 (comment) to merge it quickly to unbreak master and backport to 24.11. Non-full ffmpeg can be pursued in master using a simple revert which is where we are now.

Note: This PR's merge-base does not contain #354952; you must cherry-pick it in order to review. (I didn't want to base this on staging.)

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

With NixOS#354952, the regular ffmpeg-headless
should now have all the deps required for frigate to make use of hardware
acceleration on all hardware.

This is progress towards NixOS#271863

This reverts commit 7e33e47.

This may be surprising as it's quite soon after
7e33e47 was merged but we decided in
NixOS#357717 (comment) to merge it
quickly to unbreak master and backport to 24.11. Non-full ffmpeg can be pursued
in master using a simple revert which is where we are now.
@Atemu Atemu requested a review from mweinelt November 24, 2024 13:26
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 24, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 25, 2024
@mweinelt mweinelt merged commit 5c74641 into NixOS:staging Nov 28, 2024
37 checks passed
@Atemu Atemu deleted the frigate-ffmpeg-headless-again branch November 28, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants