[Backport release-26.05] ffmpeg_6: drop superfluous patch#535552
Merged
Conversation
(cherry picked from commit 5eedf0e)
14 tasks
13 tasks
nixpkgs-ci
Bot
added
10.rebuild-linux: 11-100
14 tasks
Contributor
|
Does the actual |
Member
What do you mean ? This is from an older PR that prevents the backport of the 5.1.10 bump |
Contributor
|
Ah, I wasn't paying attention. I misread your other comment as saying this was a manual backport due to conflicts, but you meant an additional backpack to resolve conflicts... |
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
3 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.
Bot-based backport to
release-26.05, triggered by a label in #525643.Before merging, ensure that this backport is acceptable for the release.
Even as a non-committer, if you find that it is not acceptable, leave a comment.
Tip
If you maintain all packages touched by this pull request, and they are all located under
pkgs/by-name/*, you can comment@NixOS/nixpkgs-merge-bot mergeto automatically merge this PR using thenixpkgs-merge-bot.