From d06dc4c8541d40d631014ab7e10b6653ff05e4a3 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Sun, 1 Feb 2026 16:14:27 -0800 Subject: [PATCH] slsk-batchdl: dotnet 8 -> 10 dotnet 8 is broken on aarch64-darwin so I tried building with dotnet 10. Works fine! Tested with `result/bin/sldl spotify-likes --print-tracks -n 10`. --- pkgs/by-name/sl/slsk-batchdl/deps.json | 75 ++++++++++++++++++++++++ pkgs/by-name/sl/slsk-batchdl/package.nix | 4 +- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slsk-batchdl/deps.json b/pkgs/by-name/sl/slsk-batchdl/deps.json index 2880bd6e22cb..ac04a5fced0a 100644 --- a/pkgs/by-name/sl/slsk-batchdl/deps.json +++ b/pkgs/by-name/sl/slsk-batchdl/deps.json @@ -39,6 +39,31 @@ "version": "1.11.72", "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k=" }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.23", + "hash": "sha256-MhWoomc6BwUta7PxbnGC3Fno+GQx3aUEtg/LBDAEi38=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.23", + "hash": "sha256-tG2pcAzeiDBouBrMVaYrCD2M2jCXJ4wk2sNOF2KQILk=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.23", + "hash": "sha256-PGtAymoWt5+PBLjt+krej6KruhWy+D+dUE4PgVZSx88=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "8.0.23", + "hash": "sha256-fZQKWvYkS/fXUK8BIWD4dSOo1jltO0fDSy0TT+U3H9c=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "8.0.23", + "hash": "sha256-HsEhlsBgaDkIDgVz3oPkFe3dRcYFqrHEnikKaTqqWpo=" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.1", @@ -49,6 +74,56 @@ "version": "4.7.0", "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, + { + "pname": "Microsoft.NET.ILLink.Tasks", + "version": "8.0.23", + "hash": "sha256-CZRiTLcHzhuitBOdeGnLZbVrzh6qwwhTbd7ET4yxVJU=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.23", + "hash": "sha256-C7fkJ6CSrORo8ST27oN1bvApyFD/3P5G40LEJHan8dQ=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.23", + "hash": "sha256-QSyUAyYwlDbFdWXKMD+Gm+2gkwjEZu+JyxpTIuIHl5w=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "8.0.23", + "hash": "sha256-7ztl28l8zPNREGKvR9IcrVDm13/Fi2xSqD8fjxE6yLM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "8.0.23", + "hash": "sha256-/eDywkBIggw2lt65yf1HFs8wSc1IgrTpEg/aKIz1y7g=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.23", + "hash": "sha256-Vevn8gsO4gCnGo0ns6B7i0MedAnEq3nBgnqx/E7aI44=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.23", + "hash": "sha256-DyEbaM692s4YBvufr3ebhFH9j2miUAisTIXT5E3fCYg=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.23", + "hash": "sha256-s5iFeWfR2RebcBVPJcxxs2ceDdyol6ut2+g2kRCGIJs=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "8.0.23", + "hash": "sha256-IN/OdsXuwiuJG7gu/Gh7nVoL8rgUyMlK+LOkrHoyo+s=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "8.0.23", + "hash": "sha256-86dZZBxKLtaQH17UBBIu1nO8CNfxT64ZBL+HRf1kd4A=" + }, { "pname": "Newtonsoft.Json", "version": "13.0.3", diff --git a/pkgs/by-name/sl/slsk-batchdl/package.nix b/pkgs/by-name/sl/slsk-batchdl/package.nix index 28e0f8f016e4..9613149b46c7 100644 --- a/pkgs/by-name/sl/slsk-batchdl/package.nix +++ b/pkgs/by-name/sl/slsk-batchdl/package.nix @@ -22,7 +22,7 @@ buildDotnetModule (finalAttrs: { substituteInPlace \ slsk-batchdl/slsk-batchdl.csproj \ slsk-batchdl.Tests/slsk-batchdl.Tests.csproj \ - --replace-fail "net6.0" "net8.0" + --replace-fail "net6.0" "net10.0" ''; projectFile = "slsk-batchdl/slsk-batchdl.csproj"; @@ -31,7 +31,7 @@ buildDotnetModule (finalAttrs: { # See: https://github.com/fiso64/slsk-batchdl/issues/111 # testProjectFile = "slsk-batchdl.Tests/slsk-batchdl.Tests.csproj"; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; nugetDeps = ./deps.json; executables = [ "sldl" ];