Skip to content

ffmpeg_8: 8.1.1 -> 8.1.2#534374

Merged
dotlambda merged 1 commit into
NixOS:stagingfrom
bartoostveen:ffmpeg-updates
Jun 22, 2026
Merged

ffmpeg_8: 8.1.1 -> 8.1.2#534374
dotlambda merged 1 commit into
NixOS:stagingfrom
bartoostveen:ffmpeg-updates

Conversation

@bartoostveen

@bartoostveen bartoostveen commented Jun 22, 2026

Copy link
Copy Markdown
Member

Things done

@bartoostveen bartoostveen added the backport release-26.05 Backport PR automatically label Jun 22, 2026
@bartoostveen

Copy link
Copy Markdown
Member Author

Will build and test on x86_64-linux in a sec

nixpkgs-branch-check[bot]

This comment was marked as outdated.

@bartoostveen

Copy link
Copy Markdown
Member Author

Oh, historically this was done on master, will rebase upon staging then. I probably do not have the cycles to run this on staging though

@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux 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-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Jun 22, 2026
@bartoostveen bartoostveen changed the base branch from master to staging June 22, 2026 20:51
@bartoostveen bartoostveen changed the title ffmpeg_8: 8.1 -> 8.1.2, ffmpeg_7: 7.1.4 -> 7.1.5, ffmpeg_6: 6.1.5 -> 6.1.6, ffmpeg_4: 4.4.7 -> 4.4.8 ffmpeg_8: 8.1.1 -> 8.1.2, ffmpeg_7: 7.1.4 -> 7.1.5, ffmpeg_6: 6.1.5 -> 6.1.6, ffmpeg_4: 4.4.7 -> 4.4.8 Jun 22, 2026
@bartoostveen bartoostveen added backport staging-26.05 Backport PR automatically and removed backport release-26.05 Backport PR automatically labels Jun 22, 2026
@bartoostveen

Copy link
Copy Markdown
Member Author

cc @dotlambda (as a committer that seemed to be involved in the past)

@bartoostveen bartoostveen added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jun 22, 2026
@bartoostveen

Copy link
Copy Markdown
Member Author

(CVE-2026-8461, CVE-2026-30999)

@dotlambda

Copy link
Copy Markdown
Member

Oh, historically this was done on master, will rebase upon staging then.

Please rebase on git merge-base master staging instead. That makes it easier to test the builds locally.

@bartoostveen

Copy link
Copy Markdown
Member Author

I did this already, the bot is still catching up

@dotlambda

Copy link
Copy Markdown
Member

I actually suggest splitting this into multiple PRs. Some of them can go straight to master.

@bartoostveen

Copy link
Copy Markdown
Member Author

Which ones do you want on master?

@bartoostveen

Copy link
Copy Markdown
Member Author

All except 8 I suppose?

@nixpkgs-branch-check nixpkgs-branch-check Bot dismissed their stale review June 22, 2026 21:00

Review dismissed automatically

@dotlambda

Copy link
Copy Markdown
Member

Yeah, it looks like every other version causes less than 500 rebuilds.

@nixpkgs-ci nixpkgs-ci Bot added the 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. label Jun 22, 2026
@bartoostveen

Copy link
Copy Markdown
Member Author

#534377, #534378, #534379

@bartoostveen bartoostveen changed the title ffmpeg_8: 8.1.1 -> 8.1.2, ffmpeg_7: 7.1.4 -> 7.1.5, ffmpeg_6: 6.1.5 -> 6.1.6, ffmpeg_4: 4.4.7 -> 4.4.8 ffmpeg_8: 8.1.1 -> 8.1.2 Jun 22, 2026
@dotlambda

dotlambda commented Jun 22, 2026

Copy link
Copy Markdown
Member

I did this already, the bot is still catching up

No, there are plenty of commits in your branch that are not in master. But I also noted that 8.1.1 is only in staging, so it would have been impossible to base on git merge-base master staging anyway.
Doesn't matter now, it's advice for the future.

Also, please link to the changelog in the commit message and PR description going forward.

@dotlambda dotlambda added this pull request to the merge queue Jun 22, 2026
Merged via the queue into NixOS:staging with commit 721c3f8 Jun 22, 2026
29 checks passed
@nixpkgs-ci

nixpkgs-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for staging-26.05:

@github-actions github-actions Bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 22, 2026
@bartoostveen bartoostveen deleted the ffmpeg-updates branch June 22, 2026 22:30
@jopejoe1

Copy link
Copy Markdown
Member

@NixOS/nixpkgs-ci any idea why the ffmpeg maintainers where not pinged on this pr?

@MattSturgeon

MattSturgeon commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

I'd need to re-familiarize myself with eval's comparison and maintainer filtering.

The comparison artifact found 15041 changed packages and no relevant maintainers, but the comparison logs also show:

This PR touches 1 files
File pkgs/development/libraries/ffmpeg/default.nix is unowned

IIRC, files outside of by-name need to be owned by ci/OWNERS, because we cannot assume a file->package relationship outside of by-name. But I could be misremembering something or missing some detail.

@purcell

purcell commented Jun 25, 2026

Copy link
Copy Markdown
Member

Just wanted to flag here that there are other ffmpeg versions packaged in nixpkgs: jellyfin uses ffmpeg 7.1.4, and radarr and sonarr depend on ffmpeg 5.1.4.

@dotlambda

Copy link
Copy Markdown
Member

radarr and sonarr depend on ffmpeg 5.1.4

#535419

@purcell

purcell commented Jun 26, 2026

Copy link
Copy Markdown
Member

Thanks @dotlambda. And the jellyfin folks seem to have patched jellyfin-ffmpeg too, and we have the patched version in nixpkgs. ✅

@MattSturgeon

Copy link
Copy Markdown
Contributor

IIRC, files outside of by-name need to be owned by ci/OWNERS, because we cannot assume a file->package relationship outside of by-name. But I could be misremembering something or missing some detail.

That can't be it, as #535552 pinged the maintainers correctly. Sorry for responding in haste earlier!

This PR did affect 15000 packages, so maybe it just ran into the "too many maintainers" case:

// Early sanity check, before we start making any API requests. The list of maintainers
// does not have duplicates so the only user to filter out from this list would be the
// PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check
// further down again.
// This is to protect against huge treewides consuming all our API requests for no
// reason.
if (user_maintainers.length + team_maintainers.length > 16) {
core.warning('Too many potential reviewers, skipping review requests.')
// Return a boolean on whether the "needs: reviewers" label should be set.
return users_reached.size === 0 && teams_reached.size === 0
}

I'm still confused why the comparison artifact shows maintainers.json as {}, despite changed-paths.json listing the affected packages. That's implemented here:

byUser = lib.pipe (byType.user or [ ]) [
(lib.groupBy (ping: toString ping.userId))
(lib.mapAttrs (_user: lib.map (pkg: pkg.context)))
];
byTeam = lib.pipe (byType.team or [ ]) [
(lib.groupBy (ping: toString ping.teamId))
(lib.mapAttrs (_team: lib.map (pkg: pkg.context)))
];

@dominikpaulus

Copy link
Copy Markdown

Was this intentionally backported to staging instead of staging-next? (Given that this is a security-relevant release)

@wegank

wegank commented Jun 28, 2026

Copy link
Copy Markdown
Member

This PR introduces an unresolved regression on loongarch64-linux: upstream issue + Debian Bug report

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 8.has: package (update) This PR updates a package to a newer version 8.has: port to stable This PR already has a backport to the stable release. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. backport staging-26.05 Backport PR automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants