Skip to content

Commit 20deb8c

Browse files
nyanloutreniklaskorz
authored andcommitted
sonarr: replace patch by mv command
1 parent d2fc123 commit 20deb8c

File tree

2 files changed

+20
-30
lines changed

2 files changed

+20
-30
lines changed

pkgs/by-name/so/sonarr/nuget-config.patch

Lines changed: 0 additions & 9 deletions
This file was deleted.

pkgs/by-name/so/sonarr/package.nix

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,26 @@ let
3131
tag = "v${version}";
3232
hash = "sha256-gtEDrAosI0Kyk712Kf8QDuloUBq9AArKdukX/PKAo8M=";
3333
};
34-
patches =
35-
[
36-
./nuget-config.patch
37-
]
38-
++ lib.optionals (lib.versionOlder version "5.0") [
39-
# See https://github.com/Sonarr/Sonarr/issues/7442 and
40-
# https://github.com/Sonarr/Sonarr/pull/7443.
41-
# Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,
42-
# and it may take some time for that to become stable.
43-
# However, the patches cleanly apply to v4 as well.
44-
(fetchpatch {
45-
name = "dotnet8-compatibility";
46-
url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch";
47-
hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE=";
48-
})
49-
(fetchpatch {
50-
name = "dotnet8-darwin-compatibility";
51-
url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch";
52-
hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k=";
53-
})
54-
];
34+
postPatch = ''
35+
mv src/NuGet.Config NuGet.Config
36+
'';
37+
patches = lib.optionals (lib.versionOlder version "5.0") [
38+
# See https://github.com/Sonarr/Sonarr/issues/7442 and
39+
# https://github.com/Sonarr/Sonarr/pull/7443.
40+
# Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,
41+
# and it may take some time for that to become stable.
42+
# However, the patches cleanly apply to v4 as well.
43+
(fetchpatch {
44+
name = "dotnet8-compatibility";
45+
url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch";
46+
hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE=";
47+
})
48+
(fetchpatch {
49+
name = "dotnet8-darwin-compatibility";
50+
url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch";
51+
hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k=";
52+
})
53+
];
5554
};
5655
rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system;
5756
in

0 commit comments

Comments
 (0)