Skip to content

ffmpeg: enable ffplay in small variant#296128

Merged
Atemu merged 1 commit intoNixOS:stagingfrom
SuperSandro2000:ffplay
Mar 16, 2024
Merged

ffmpeg: enable ffplay in small variant#296128
Atemu merged 1 commit intoNixOS:stagingfrom
SuperSandro2000:ffplay

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Mar 15, 2024 •
edited by Atemu
Loading

Description of changes

This is required for corrscope, also see #271863 (comment)

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@SuperSandro2000
ffmpeg: enable ffplay in small variant
4dd9a35 
This is required for corrscope, also see NixOS#271863 (comment)
@SuperSandro2000 SuperSandro2000 requested a review from Atemu March 15, 2024 12:14
This was referenced Mar 15, 2024
Open
Merged
@ofborg ofborg bot requested review from Atemu, arthsmn and jopejoe1 March 15, 2024 12:38
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Mar 15, 2024
@Atemu Atemu added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 15, 2024
@jopejoe1 jopejoe1 added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Mar 15, 2024
@Atemu
Copy link
Member

Atemu commented Mar 16, 2024

Result of nixpkgs-review pr 296128 run on x86_64-linux 1

7 packages built:
  • ffmpeg
  • ffmpeg.bin (ffmpeg.bin.bin ,ffmpeg.bin.data ,ffmpeg.bin.dev ,ffmpeg.bin.doc ,ffmpeg.bin.lib ,ffmpeg.bin.man)
  • ffmpeg.data (ffmpeg.data.bin ,ffmpeg.data.data ,ffmpeg.data.dev ,ffmpeg.data.doc ,ffmpeg.data.lib ,ffmpeg.data.man)
  • ffmpeg.dev (ffmpeg.dev.bin ,ffmpeg.dev.data ,ffmpeg.dev.dev ,ffmpeg.dev.doc ,ffmpeg.dev.lib ,ffmpeg.dev.man)
  • ffmpeg.doc (ffmpeg.doc.bin ,ffmpeg.doc.data ,ffmpeg.doc.dev ,ffmpeg.doc.doc ,ffmpeg.doc.lib ,ffmpeg.doc.man)
  • ffmpeg.lib (ffmpeg.lib.bin ,ffmpeg.lib.data ,ffmpeg.lib.dev ,ffmpeg.lib.doc ,ffmpeg.lib.lib ,ffmpeg.lib.man)
  • ffmpeg.man (ffmpeg.man.bin ,ffmpeg.man.data ,ffmpeg.man.dev ,ffmpeg.man.doc ,ffmpeg.man.lib ,ffmpeg.man.man)

@Atemu Atemu merged commit 4ff161d into NixOS:staging Mar 16, 2024
@SuperSandro2000 SuperSandro2000 deleted the ffplay branch March 17, 2024 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jopejoe1 jopejoe1 jopejoe1 approved these changes

@Atemu Atemu Awaiting requested review from Atemu

+1 more reviewer

@arthsmn arthsmn arthsmn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@SuperSandro2000 @Atemu @jopejoe1 @arthsmn