[staging] ffmpeg: ffmpeg_4 → ffmpeg_5#218309
Merged
vcunat merged 3 commits intoNixOS:stagingfrom Mar 16, 2023
Merged
Conversation
12 tasks
Member
Author
|
Member
|
Oh, that's relatively tame as far as rebuilds go. We might not need a hydra jobset for that. I'll see whether I can run nixpkgs-reivew on that tomorrow. Is there a good easy way to exclude already broken packages in nixpkgs-review? |
Member
Author
|
Not that I know of :c |
Contributor
|
Speaking of cleanup, ffmpeg 6 is out. I tried to package it with: diff --git c/pkgs/development/libraries/ffmpeg/6.nix i/pkgs/development/libraries/ffmpeg/6.nix
new file mode 100644
index 00000000000..37bdf5b060f
--- /dev/null
+++ i/pkgs/development/libraries/ffmpeg/6.nix
@@ -0,0 +1,4 @@
+import ./generic.nix {
+ version = "6.0";
+ sha256 = "sha256-RVbgsafIbeUUNXmUbDQ03ZN42oaUo0njqROo7KOQgv0=";
+}
diff --git c/pkgs/top-level/all-packages.nix i/pkgs/top-level/all-packages.nix
index 1ddec927d95..fedc4500268 100644
--- c/pkgs/top-level/all-packages.nix
+++ i/pkgs/top-level/all-packages.nix
@@ -19762,6 +19762,18 @@ with pkgs;
ffmpegVariant = "full";
};
+ ffmpeg_6 = callPackage ../development/libraries/ffmpeg/6.nix {
+ inherit (darwin.apple_sdk.frameworks)
+ Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
+ VideoDecodeAcceleration VideoToolbox;
+ };
+ ffmpeg_6-headless = ffmpeg_6.override {
+ ffmpegVariant = "headless";
+ };
+ ffmpeg_6-full = ffmpeg_6.override {
+ ffmpegVariant = "full";
+ };
+
# Aliases
# Please make sure this is updated to the latest version on the next major
# update to ffmpegBut it fails to detect the Although according to this upstream commit and the fact we add |
Member
|
Thanks for taking a look @doronbehar but could you open a separate issue on that (and ping me)? |
Member
Skipped wine (works) and chromium (unknown). Ignore the chromium-unwrapped failure, I stopped that intentionally because I didn't want to build chromium. I'll just set it to ffmpeg_4 too and let the chromium maintainers upgrade it themselves if they feel like it. I'll also mark entirely broken packages as such. |
Member
|
|
Member
|
Please pull https://github.com/Atemu/nixpkgs/tree/ffmpeg_5 |
Member
Author
Skipping that one |
ac96f54 to
50d10ac
Compare
Member
Author
|
🤔 there is a merge conflict on the merge-base of I could rebase to either, will rebase to staging for the time being since that is the merge target. |
Member
Author
|
SuperSandro2000
requested changes
Mar 5, 2023
Member
SuperSandro2000
left a comment
There was a problem hiding this comment.
I assume all the meta.broken changes are related to ffmpeg? Can you add a short comment to all of them with that information. Otherwise no one remembers why we marked those packages broken.
2c78f1a to
4eafc2c
Compare
Member
Author
Likely broken before this change:
|
Member
|
@SuperSandro2000 the packages were already broken; that's unrelated to ffmpeg. It's just that I noticed they were broken because they depend on ffmpeg transitively which causes them to show up as "changed" in nixpkgs-review of course. |
SuperSandro2000
approved these changes
Mar 13, 2023
Member
Author
|
Rebasing, give me a minute |
These packages were identified as broken when ffmpeg = ffmpeg_5. Tested _only_ by building them. If you are a maintainer of one of these packages, please test whether your package still works.
Found while changing ffmpeg from 4 to 5; these all depend on ffmpeg either directly or transitively.
4eafc2c to
f8264a5
Compare
Member
Author
|
This was the conflict: |
Member
|
We can also pull out the brokeness markings into a separate PR. I've got some more at https://github.com/atemu/nixpkgs/tree/ffmpeg_5. |
Member
|
I think this is ready from mass-rebuild perspective. Further tweaks can come later. |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as off-topic.
This comment was marked as off-topic.
12 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
Currently building and testing
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)