diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index eb437a1f8c82..a6d1a5c00089 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "4.0.18.2971"; + version = "4.0.19.2979"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,7 +29,7 @@ let owner = "Sonarr"; repo = "Sonarr"; tag = "v${version}"; - hash = "sha256-83qbbBNk42KjKZNvYaAINoWZa3uEgaV0eveGl9dKTd8="; + hash = "sha256-hYO7I1zaBSYgobd8GvIx/sWyRzflXMFjnnPB21pm4wQ="; }; postPatch = '' mv src/NuGet.Config NuGet.Config @@ -39,6 +39,20 @@ let --replace-fail 'IPNetwork' 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' ''; patches = lib.optionals (lib.versionOlder version "5.0") [ + # Prerequisite for .NET 8 patches, some commits + # touching the same files have to be reverted + (fetchpatch { + name = "revert-ffprobe-bump"; + url = "https://github.com/Sonarr/Sonarr/commit/34761ca2162eb45d1f207a097f0d546239665bfa.patch"; + revert = true; + hash = "sha256-8DNXrWtaTwNthI4tCXIf9a3xF2dBwo7IPdbtGStFX50="; + }) + (fetchpatch { + name = "revert-mailkit-bump"; + url = "https://github.com/Sonarr/Sonarr/commit/0718ba00041bf2d74749dc246bc02ad0540ec24e.patch"; + revert = true; + hash = "sha256-+S4bt5Ult48nwXXOhZ57UIOYg0sInZDlvBWeySZfGyY="; + }) # See https://github.com/Sonarr/Sonarr/issues/7442 and # https://github.com/Sonarr/Sonarr/pull/7443. # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,