diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index b97cd221b2d9..a9b2f5a7fbf1 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -501,23 +501,23 @@ }, { "pname": "HotChocolate.Language.SyntaxTree", - "version": "14.1.0", - "hash": "sha256-4cRFDfLW+A0378BZ0wzPrc7FOiuTdCtlA4gyitSrhiI=" + "version": "15.0.3", + "hash": "sha256-PXlle10Q2Yuhcip1WhY922G5ObD4yRwYyPyUqci7Z7A=" }, { "pname": "HotChocolate.Transport.Abstractions", - "version": "14.1.0", - "hash": "sha256-i8i4ovnxHcFRrnU/a3U01izWEa+OsOjxgLDRq7wo1vs=" + "version": "15.0.3", + "hash": "sha256-uRSetnfWOwar73WO/wplsHexCzpbZf6xYxVBLWaIwLo=" }, { "pname": "HotChocolate.Transport.Http", - "version": "14.1.0", - "hash": "sha256-e5VoAtmieIhNvhtGMnmPXqYAZE9SrXlfyJmDKF7LBJo=" + "version": "15.0.3", + "hash": "sha256-9SkFbGb/uYmIGPDT1LnF3m42c8sEeCZBv4OuClMEU6w=" }, { "pname": "HotChocolate.Utilities", - "version": "14.1.0", - "hash": "sha256-KIYlc1jDG1BT6gZGZoei6ypHXZo9I3dN4zM/NpDWJuI=" + "version": "15.0.3", + "hash": "sha256-9y7iNQqv1wrkuGZ3ovXkQQ+seSB4bZwexfmlneoeEAg=" }, { "pname": "HtmlAgilityPack", @@ -889,11 +889,6 @@ "version": "6.0.0", "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" }, - { - "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "8.0.0", - "hash": "sha256-e4wqTJUgPfq6CfRwuXTw32K9vB+hOpSLxSZDpzv23Yg=" - }, { "pname": "Microsoft.AspNetCore.WebUtilities", "version": "9.0.0", @@ -1269,11 +1264,6 @@ "version": "9.0.0", "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" }, - { - "pname": "Microsoft.Extensions.Http", - "version": "8.0.0", - "hash": "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY=" - }, { "pname": "Microsoft.Extensions.Http", "version": "9.0.0", @@ -1384,11 +1374,6 @@ "version": "9.0.0", "hash": "sha256-pplZskMsR3gGbs3I0wycGsvIMPIpfWFJpOsR9GkiYRw=" }, - { - "pname": "Microsoft.Extensions.ObjectPool", - "version": "8.0.0", - "hash": "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg=" - }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "9.0.0", @@ -2251,28 +2236,28 @@ }, { "pname": "StrawberryShake.Core", - "version": "14.1.0", - "hash": "sha256-h1Ozv0vdR2UvHIw3JqoBNKPVuD1S31aui7IQ8i8hcnE=" + "version": "15.0.3", + "hash": "sha256-bAqmB6l6r1GAAm6w0BcUdwGlktU/FAeB3vPiENmOaKg=" }, { "pname": "StrawberryShake.Resources", - "version": "14.1.0", - "hash": "sha256-6uOb5V7UeHM9OKUTJ4p8/YwvI16LcrC12tPhSAw3U0Q=" + "version": "15.0.3", + "hash": "sha256-m50HKpBrcQkrJxlRAfg2RNobMbv9yw3jakDz7Hp/sn8=" }, { "pname": "StrawberryShake.Server", - "version": "14.1.0", - "hash": "sha256-6K6TnX8YL0Dbt8wTv9FmBlbSo+UfaucHi9a5CqWCjoY=" + "version": "15.0.3", + "hash": "sha256-Tdl27WUE0pA+SXZetKjPPcQxM6rxzf1Cnjz6Jw/XZaM=" }, { "pname": "StrawberryShake.Transport.Http", - "version": "14.1.0", - "hash": "sha256-Pa2vACAYMgLrAxiZUR7PxBvPY9wrclQRYGZod/VMG5Q=" + "version": "15.0.3", + "hash": "sha256-UmB5tTEwB0JImx/LDb+ihCao4YxsT3XvHJpuUDBMODc=" }, { "pname": "StrawberryShake.Transport.WebSockets", - "version": "14.1.0", - "hash": "sha256-Hqp6GSxMcYorg5v8ns24DNfUDwYGY3urg0FKPleD86I=" + "version": "15.0.3", + "hash": "sha256-Nz70BHgzDzxIRzIjKgx6Vx1T+K/UKoPkG6wP/yNKVYs=" }, { "pname": "Svg.Custom", @@ -2609,6 +2594,11 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, { "pname": "System.Linq", "version": "4.1.0", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 9340467099f6..f98c2fd3c789 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -59,18 +59,18 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.json; mapNuGetDependencies = true; - # TODO: remove .NET 8; StrawberryShake currently needs it - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_9_0 - runtime_8_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; postPatch = '' # for some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png + + # Bump StrawberryShake so we can drop .NET 8 + # See https://github.com/Nexus-Mods/NexusMods.App/pull/2830 + substituteInPlace Directory.Packages.props \ + --replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \ + 'Include="StrawberryShake.Server" Version="15.0.3"' ''; makeWrapperArgs = [