nv-codec-headers: 12.0.16.0 -> 12.1.14.0, ffmpeg: 6.0 -> 6.1, jellyfin-ffmpeg: 6.0-7 -> 6.0.1-1#271905
nv-codec-headers: 12.0.16.0 -> 12.1.14.0, ffmpeg: 6.0 -> 6.1, jellyfin-ffmpeg: 6.0-7 -> 6.0.1-1#271905Atemu merged 9 commits intoNixOS:stagingfrom arthsmn:update-ffmpeg
Conversation
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
Atemu
left a comment
There was a problem hiding this comment.
Please rebase away the merge commit.
Done. |
chayleaf
left a comment
There was a problem hiding this comment.
might be worth pinging gifsik and wl-screenrec maintainers after merging so they know about the switch to ffmpeg_5 (it would be hard to notice the change in all-packages.nix)
Done. |
chayleaf
left a comment
There was a problem hiding this comment.
there's a couple of comment typos but i'm not gonna nitpick comments
Can you point them? English is not my first language and I'm not fluent yet lol. |
Nah, you're fine. Maintainership "only" means that people come to you if the package needs to change. You'll get pinged on any PRs that touches ffmpeg for example. What you need to maintain a package is knowledge about the package's specifics; how to test it still works etc. General Nix/Nixpkgs experience always helps of course but that's not the important part here. |
Oh thanks for the clarification, I think I'll add myself so. |
|
@ofborg eval |
|
Result of 59 packages built:
|
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
Also, I think #260538 can be closed. |
|
You're welcome @arthsmn :) |
|
Not familiar with the stability of these packages across minor version bumps, but is this backportable to 23.11? Cherry-picking this merge onto |
I think they don't bump versions on stable releases, maybe @Atemu can give a way. |
|
This broke jellyfin-ffmpeg. It now fails with: It can be fixed with diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index 7109a5d6dfd1..f519fb15b9b9 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -4,7 +4,7 @@
, lib
}:
-ffmpeg_6-full.overrideAttrs (old: rec {
+(ffmpeg_6-full.override { withAribcaption = false; }).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "6.0.1-1";But I have no idea if this is actually an acceptable fix. It looks like jellyfin-ffmpeg has not been updated with ffmpeg 6.1 |
First of all, jellyfin-ffmpeg will just be updated in version 7 of ffmpeg. This is a known issue and it's being discussed here and in the PRs associated with the issue. |
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.