-
-
Notifications
You must be signed in to change notification settings - Fork 15k
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sonarr: upgrade to dotnet 8 and 4.0.11.2680 -> 4.0.12.2823 #380045
Conversation
63da452
to
512350f
Compare
Build seems to be failing on darwin, will investigate what's up with that. Edit: Disabled the failing test
which unfortunately doesn't seem to be fixed by |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hah, nice, thanks — I spent a few minutes this morning trying to find an upstream PR that might have fixed things for dotnet 8, but in the end I worried that further libraries would need patching too.
Seems reasonable to disable that additional test on MacOS.
Would you consider adding yourself as a maintainer in this PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn’t test the PR on my Sonarr instance yet, but otherwise LGTM with some minor changes 👍
de3ce5e
to
ce750ac
Compare
fc525bc
to
9ff93b6
Compare
|
9ff93b6
to
e16a609
Compare
Seems to be working fine on 24.11 stable branch using an overlay. Added backport tag. diff --git a/flake.nix b/flake.nix
index 1cf1dcc..96ed00e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,9 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-24.11";
+ nixpkgs-sonarr-dotnet8.url = "github:niklaskorz/nixpkgs/sonarr-dotnet8";
+ nixpkgs-sonarr-dotnet8.flake = false;
+
flake-parts.url = "flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
diff --git a/nixpkgs.nix b/nixpkgs.nix
index e8cfa01..d70169d 100644
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@@ -13,6 +13,11 @@
inputs.btrfs-rollback.overlays.default
(import ./overlays/java-wrappers.nix)
(import ./overlays/mcactivity.nix)
+ (final: _: {
+ sonarr = final.callPackage (
+ inputs.nixpkgs-sonarr-dotnet8.outPath + "/pkgs/by-name/so/sonarr/package.nix"
+ ) { };
+ })
];
config.allowUnfreePredicate =
@@ -26,15 +31,6 @@
};
in
pkg: builtins.hasAttr (lib.getName pkg) allowUnfree;
-
- # Sonarr uses .NET 6 that is EOL.
- # https://github.com/NixOS/nixpkgs/issues/360592
- config.permittedInsecurePackages = [
- "aspnetcore-runtime-6.0.36"
- "aspnetcore-runtime-wrapped-6.0.36"
- "dotnet-sdk-6.0.428"
- "dotnet-sdk-wrapped-6.0.428"
- ];
};
nixpkgsFun = newArgs: import inputs.nixpkgs (nixpkgsArgs // newArgs); |
|
@niklaskorz anything blocking merge? |
All good to go from my side |
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-380045-to-release-24.11 origin/release-24.11
cd .worktree/backport-380045-to-release-24.11
git switch --create backport-380045-to-release-24.11
git cherry-pick -x 8a73d99096c927dd9baae07f27c02b55c33e48fd 16e717892acca7f7782e46021e7c9af2c8d83464 5e864681f40ef505d1e238ba390dc39bfea6a49a 31382adf95f88502f0ceddd88dab56a98dbd887c e93c5752112cfba450faa683c8c73942fbccc008 e16a609fa71d4c8a5263e9d34f952b48b347fa69 |
I can create backport tomorrow manually if nobody does that before. |
Fixes #360592
This applies the patches from Sonarr/Sonarr#7443, which was only merged into the sonarr v5 branch but happens to cleanly apply to v4 as well.
As
fetchYarnDeps
needs access to the lockfile inside the source, and the pull request happened to updateyarn.lock
, I had to introduceapplyPatches
to the src.I also made sure the update script stays compatible by passing the patched source directory to
prefetch-yarn-deps
.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.