Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 #314775

Merged
merged 3 commits into from
May 28, 2024

Conversation

Nanotwerp
Copy link
Contributor

@Nanotwerp Nanotwerp commented May 26, 2024

Description of changes

Updates jellyfin from 10.9.1 to 10.9.3 and jellyfin-web from 10.9.2 to 10.9.3. This also contains a change to jellyfin-web that adds an assert that only builds jellyfin-web if it is on the same version as jellyfin. Note that using nixfmt-rfc-style changed the default.nix of jellyfin, due to it not being formatted by it before. jellyfin-web's web.nix was unaffected by the formatting.

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

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3989

@Tasqa
Copy link
Contributor

Tasqa commented May 26, 2024

Will this be backported to 24.05?

@AkechiShiro
Copy link
Contributor

AkechiShiro commented May 27, 2024

Jellyfin 10.9.3 is out btw, maybe this PR should update jellyfin and jellyfin-web to 10.9.3 @nyanloutre @minijackson @purcell @jojosch

@Nanotwerp Nanotwerp changed the title jellyfin: 10.9.1 -> 10.9.2 jellyfin: 10.9.1 -> 10.9.3 May 27, 2024
@Nanotwerp
Copy link
Contributor Author

Jellyfin 10.9.3 is out btw, maybe this PR should update jellyfin and jellyfin-web to 10.9.3 @nyanloutre @minijackson @purcell @jojosch

Done!

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to play with this PR locally, so I pushed a very similar change overall, but with 3 commits.

pkgs/servers/jellyfin/web.nix Outdated Show resolved Hide resolved
pkgs/servers/jellyfin/web.nix Outdated Show resolved Hide resolved
pkgs/servers/jellyfin/web.nix Outdated Show resolved Hide resolved
@Nanotwerp Nanotwerp force-pushed the jellyfin-up branch 2 times, most recently from 4aba7fc to f18db95 Compare May 27, 2024 07:18
@Nanotwerp Nanotwerp changed the title jellyfin: 10.9.1 -> 10.9.3 jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 May 27, 2024
@Nanotwerp Nanotwerp changed the title jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 May 27, 2024
@Nanotwerp Nanotwerp force-pushed the jellyfin-up branch 2 times, most recently from d55b056 to 67a13f3 Compare May 27, 2024 20:30
@Nanotwerp Nanotwerp requested a review from doronbehar May 27, 2024 20:43
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1687

The `default.nix` was also formatted with `nixfmt-rfc-style` to be `RFC 166`-compliant.
@doronbehar doronbehar merged commit 22a5fc0 into NixOS:master May 28, 2024
22 of 24 checks passed
@Nanotwerp Nanotwerp deleted the jellyfin-up branch May 28, 2024 06:08
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-314775-to-release-23.11 origin/release-23.11
cd .worktree/backport-314775-to-release-23.11
git switch --create backport-314775-to-release-23.11
git cherry-pick -x a7441feb23f2ba370fb3ae130f51113c5c72b8f2 5cd7bbe6fef246db9c1e3cbbd4e26c45f8c13074 30dac56dab94c3dfbf50cd18c0003cf2d87839c1

1 similar comment
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-314775-to-release-23.11 origin/release-23.11
cd .worktree/backport-314775-to-release-23.11
git switch --create backport-314775-to-release-23.11
git cherry-pick -x a7441feb23f2ba370fb3ae130f51113c5c72b8f2 5cd7bbe6fef246db9c1e3cbbd4e26c45f8c13074 30dac56dab94c3dfbf50cd18c0003cf2d87839c1

Copy link
Contributor

Successfully created backport PR for release-24.05:

Copy link
Contributor

Git push to origin failed for release-24.05 with exitcode 1

@minijackson
Copy link
Member

huh? Maybe the backport action didn't like me adding 2 tags at once.

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

Successfully merging this pull request may close these issues.

None yet

6 participants