From 673e0983c86a21c7658fbf2323ae3597dcc28f18 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 27 Oct 2026 10:08:13 -0300 Subject: [PATCH 1/4] renode{,-unstable}: remove WindowsDesktop dependency --- pkgs/by-name/re/renode-unstable/deps.json | 5 ----- pkgs/by-name/re/renode/deps.json | 5 ----- pkgs/by-name/re/renode/package.nix | 2 ++ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/deps.json b/pkgs/by-name/re/renode-unstable/deps.json index 2a4242b5dc03..69cc1f46da0e 100644 --- a/pkgs/by-name/re/renode-unstable/deps.json +++ b/pkgs/by-name/re/renode-unstable/deps.json @@ -164,11 +164,6 @@ "version": "5.0.0", "hash": "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo=" }, - { - "pname": "Microsoft.WindowsDesktop.App.Ref", - "version": "10.0.12", - "hash": "sha256-omruH9MPqONFT43CGi3/ZDuw8UkqIp0kZhTfq/CMr4k=" - }, { "pname": "Mono.Cecil", "version": "0.11.3", diff --git a/pkgs/by-name/re/renode/deps.json b/pkgs/by-name/re/renode/deps.json index 2a4242b5dc03..69cc1f46da0e 100644 --- a/pkgs/by-name/re/renode/deps.json +++ b/pkgs/by-name/re/renode/deps.json @@ -164,11 +164,6 @@ "version": "5.0.0", "hash": "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo=" }, - { - "pname": "Microsoft.WindowsDesktop.App.Ref", - "version": "10.0.12", - "hash": "sha256-omruH9MPqONFT43CGi3/ZDuw8UkqIp0kZhTfq/CMr4k=" - }, { "pname": "Mono.Cecil", "version": "0.11.3", diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index e44e28a260f6..912ca0194968 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -103,6 +103,8 @@ buildDotnetModule (finalAttrs: { "-p:Architecture=${hostArch}" "-p:Version=${lib.head (lib.splitString "-" finalAttrs.version)}" "-p:InformationalVersion=${finalAttrs.version}+git${finalAttrs.src.rev}" + # this removes the Microsoft.WindowsDesktop.App.Ref dependency + "-p:EnableWindowsTargeting=false" ]; dotnetInstallFlags = [ "-p:TargetFramework=${targetFramework}" ]; From b15c34ba6b452dd4d42767e804eedeec449b596b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 27 Oct 2026 10:40:12 -0300 Subject: [PATCH 2/4] duplicati: remove WindowsDesktop dependency --- pkgs/by-name/du/duplicati/deps.json | 70 --------------------------- pkgs/by-name/du/duplicati/package.nix | 2 +- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/pkgs/by-name/du/duplicati/deps.json b/pkgs/by-name/du/duplicati/deps.json index 66256e591eb6..296ba525eae7 100644 --- a/pkgs/by-name/du/duplicati/deps.json +++ b/pkgs/by-name/du/duplicati/deps.json @@ -904,11 +904,6 @@ "version": "17.14.1", "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" }, - { - "pname": "Microsoft.Toolkit.Uwp.Notifications", - "version": "7.1.3", - "hash": "sha256-sygTmtEBzLgQ6dh0Hpq/Cz9x+dcDl73+9maOvZvNbF4=" - }, { "pname": "Microsoft.VisualStudio.Threading", "version": "16.3.52", @@ -944,16 +939,6 @@ "version": "10.0.0", "hash": "sha256-p0rfcBwM6pkVY+G49ujVcHwwFgrEq46FGPpGFOg0H5w=" }, - { - "pname": "Microsoft.Windows.SDK.NET.Ref", - "version": "10.0.17763.57", - "hash": "sha256-zlqlDMcjBqA8pXPhh5vuYBwc5u4622orITqeECn1xps=" - }, - { - "pname": "Microsoft.WindowsDesktop.App.Ref", - "version": "10.0.12", - "hash": "sha256-omruH9MPqONFT43CGi3/ZDuw8UkqIp0kZhTfq/CMr4k=" - }, { "pname": "MimeKit", "version": "4.17.0", @@ -1244,21 +1229,11 @@ "version": "10.0.0", "hash": "sha256-pN3tld926Fp0n5ZNjjzIJviUQrynlOAB0vhc1aoso6E=" }, - { - "pname": "System.DirectoryServices", - "version": "9.0.7", - "hash": "sha256-xp5ldf1KFEytrvlGKbk3Oe39I1y/nJJdF0dv9tj/iKU=" - }, { "pname": "System.Drawing.Common", "version": "10.0.0", "hash": "sha256-ZFneSifHbDj3O+IbwHSSs5YpDEunTeu9Hnz9APZKOA8=" }, - { - "pname": "System.Drawing.Common", - "version": "4.7.0", - "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk=" - }, { "pname": "System.Drawing.Common", "version": "7.0.0", @@ -1384,66 +1359,21 @@ "version": "2.14.3623", "hash": "sha256-Rv5/hVXKrSOOCn9aHbaH6TmB9H2Xvq1kyJv5sQRygRo=" }, - { - "pname": "Vanara.Core", - "version": "4.1.2", - "hash": "sha256-nZQ2GV1Uv1hpmjj5MBOhz0A+RULCHyns1xiXaMy2UsY=" - }, { "pname": "Vanara.Core", "version": "5.0.0", "hash": "sha256-jv9TBQ8KkkrLWPC2F6XwBdrLj5bN1rovLFoIORFAUew=" }, - { - "pname": "Vanara.PInvoke.Cryptography", - "version": "5.0.0", - "hash": "sha256-lwRGaswib9H6sw6vmF0GEaDl3KqrcikVisjzYvNwbuU=" - }, - { - "pname": "Vanara.PInvoke.Gdi32", - "version": "5.0.0", - "hash": "sha256-iewIEufCyCBKWx4Lpj2m7HwQgOYwP2ZEdt/wtRw4KBM=" - }, { "pname": "Vanara.PInvoke.Kernel32", "version": "5.0.0", "hash": "sha256-sF4VLD+XvzIpjP5S1GG92SQRzfH20Lum2ljmqQkZWQ4=" }, - { - "pname": "Vanara.PInvoke.NTDSApi", - "version": "5.0.0", - "hash": "sha256-wB73Dt7fQ1z89jLZ93PP6khwWQYSlPKRN2G8DIQO+sc=" - }, - { - "pname": "Vanara.PInvoke.Security", - "version": "5.0.0", - "hash": "sha256-tkQy3OZ+IW8Qoq1aLbTWFjTts6ZV0sjngtnbBR/6jz0=" - }, - { - "pname": "Vanara.PInvoke.Shared", - "version": "4.1.2", - "hash": "sha256-kmcBNcn98sfWtmLrFcuxiyxa6BJLacl5uNHaRBGmc8k=" - }, { "pname": "Vanara.PInvoke.Shared", "version": "5.0.0", "hash": "sha256-GmYvYTQspfDPtJOG8d4M6Hy2vHtCc10pVXraSsmy26s=" }, - { - "pname": "Vanara.PInvoke.User32", - "version": "5.0.0", - "hash": "sha256-HTj/KpzsppERmSewriiSmGPnZXdpOIAcYC6buPTLyyo=" - }, - { - "pname": "Vanara.PInvoke.VssApi", - "version": "5.0.0", - "hash": "sha256-L4xkuHHKP8FPkLs+F00via2mBYHGcqzNG9rpS0VDsk0=" - }, - { - "pname": "Vanara.Security", - "version": "5.0.0", - "hash": "sha256-Zd3s9PVMFOo3QKBWiS1RbrcaNNJEY23wBIndYbXTTyQ=" - }, { "pname": "VaultSharp", "version": "1.17.5.1", diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index aa4a3cc0e9bb..d57f8cbcb4fa 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -128,7 +128,7 @@ buildDotnetModule { ]; postPatch = '' - sed -i '/Duplicati.ShellExtension.csproj/d' Duplicati.slnx + sed -i '/\(Duplicati.ShellExtension\|Duplicati.Library.WindowsModules\|Duplicati.WindowsModulesLoader\).csproj/d' Duplicati.slnx rm -rf Duplicati/Server/webroot/ngclient ln -s ${ngclient}/browser Duplicati/Server/webroot/ngclient From b2443c26d9bd5787532fafc897741e02e66a0fc4 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 27 Oct 2026 10:45:58 -0300 Subject: [PATCH 3/4] uvtools: use runtime packages from nixpkg --- pkgs/by-name/uv/uvtools/deps.json | 80 ----------------------------- pkgs/by-name/uv/uvtools/package.nix | 15 +++++- 2 files changed, 14 insertions(+), 81 deletions(-) diff --git a/pkgs/by-name/uv/uvtools/deps.json b/pkgs/by-name/uv/uvtools/deps.json index 8348d31fe512..0b4cc07f2e02 100644 --- a/pkgs/by-name/uv/uvtools/deps.json +++ b/pkgs/by-name/uv/uvtools/deps.json @@ -199,36 +199,6 @@ "version": "0.11.6", "hash": "sha256-RTr200R3sZuyxi0XQ25ox2p1kVt5R1CbH/YBs21+eNg=" }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "8.0.31", - "hash": "sha256-vMnNfXlEkZq5fpys8z5SnCn9q/BYXLw+CXcEdGeD6hg=" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "9.0.20", - "hash": "sha256-ZMaHC0MFs2YvW/fHGsxuXZnS74rcS9GJ1LGaMuscdMo=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "8.0.31", - "hash": "sha256-gPPxKQRPdKXBKlGyLe4jg/gNZ4vYa3iCwshiRPmkH4s=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "9.0.20", - "hash": "sha256-fAcTgHdWUgQ1Q6gO1WfHzrcmdxyCNxosYyRgP0nnlt0=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.31", - "hash": "sha256-0sAwUHBaAhI2vIRlSD/HtNBrJHa132JTzfnWIDaPJXY=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "9.0.20", - "hash": "sha256-ll6isPNcUHbChwtBEh+vIi6AI1DMf+cRaxk/q+d5Iyg=" - }, { "pname": "Microsoft.Build.Tasks.Git", "version": "10.0.401", @@ -304,56 +274,6 @@ "version": "18.10.1", "hash": "sha256-12rO5bWnSE7xdrZg4zgRxu8/M4vUdR46ov0xiz2y/P4=" }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "8.0.31", - "hash": "sha256-2FWhduT40HVnt18J46uxhF5RxK9kdUojw8w24s+77zU=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "9.0.20", - "hash": "sha256-LQDhn3AD6gIiBSf8Je+rdwLjtssNx8NR7Zt3u9G1+GM=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.31", - "hash": "sha256-MGH8ZnjM4fZFp63mbLNpkojI2T7TvpvNgvpjOGfrTIE=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "9.0.20", - "hash": "sha256-lsqBpxZyE13FPNsQrSEXDyjTpXnF6PX/hnUx4a+IikM=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "8.0.31", - "hash": "sha256-oChiwq8Hnb0R+Fx61PlO1VMFUw4M8Gcd4nnxoSlPIMY=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "9.0.20", - "hash": "sha256-6FQ6u7gCcf0IabmnZZ2jUU2TpYNQHzcPtqT1BaoaMkI=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "8.0.31", - "hash": "sha256-yIr6s/EZUrzm1k3H0CImh1vtcomBgECs37q4B3hnQwI=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "9.0.20", - "hash": "sha256-QO3vk6l6ONBC4MfeppSIKbFJWXhxcl18jKePoBWHT6w=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.31", - "hash": "sha256-J6iRM18YDWcyxaU7SEd5B1O276obx8P4FAE6qWjWqjY=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "9.0.20", - "hash": "sha256-hCPvae3q8+fSnPqVWWXkziZsrkATUy2bcLEGjUKC5ik=" - }, { "pname": "Microsoft.SourceLink.Common", "version": "10.0.401", diff --git a/pkgs/by-name/uv/uvtools/package.nix b/pkgs/by-name/uv/uvtools/package.nix index 927be9e78301..2c82630c8374 100644 --- a/pkgs/by-name/uv/uvtools/package.nix +++ b/pkgs/by-name/uv/uvtools/package.nix @@ -69,7 +69,20 @@ buildDotnetModule (finalAttrs: { doCheck = true; testProjectFile = "tests/UVtools.Tests/UVtools.Tests.csproj"; - dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-sdk = + with dotnetCorePackages; + sdk_10_0 + // { + inherit + (combinePackages [ + sdk_10_0 + sdk_9_0 + sdk_8_0 + ]) + packages + targetPackages + ; + }; dotnet-runtime = dotnetCorePackages.runtime_10_0; executables = [ From 391e503101b1ead66b5645f634461f2ed20e8a80 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 27 Oct 2026 16:43:06 -0300 Subject: [PATCH 4/4] slsk-batchdl: use runtime packages from nixpkg --- pkgs/by-name/sl/slsk-batchdl/deps.json | 115 ----------------------- pkgs/by-name/sl/slsk-batchdl/package.nix | 14 ++- 2 files changed, 13 insertions(+), 116 deletions(-) diff --git a/pkgs/by-name/sl/slsk-batchdl/deps.json b/pkgs/by-name/sl/slsk-batchdl/deps.json index ac04a5fced0a..e540e206db66 100644 --- a/pkgs/by-name/sl/slsk-batchdl/deps.json +++ b/pkgs/by-name/sl/slsk-batchdl/deps.json @@ -39,91 +39,6 @@ "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", - "hash": "sha256-A3W2Hvhlf1ODx1NYWHwUyziZOGMaDPvXHZ/ubgNLYJA=" - }, - { - "pname": "Microsoft.CSharp", - "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", @@ -154,41 +69,11 @@ "version": "7.0.0", "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=" }, - { - "pname": "System.IO.Pipelines", - "version": "9.0.1", - "hash": "sha256-CnmDanknCGbNnoDjgZw62M/Grg8IMTJDa8x3P07UR2A=" - }, { "pname": "System.Management", "version": "7.0.2", "hash": "sha256-bJ21ILQfbHb8mX2wnVh7WP/Ip7gdVPIw+BamQuifTVY=" }, - { - "pname": "System.Memory", - "version": "4.6.0", - "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "9.0.1", - "hash": "sha256-iuAVcTiiZQLCZjDfDqdLLPHqZdZqvFabwLFHiVYdRJo=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.1", - "hash": "sha256-2dqE+Mx5eJZ8db74ofUiUXHOSxDCmXw5n9VC9w4fUr0=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.6.0", - "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY=" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" - }, { "pname": "TagLibSharp", "version": "2.3.0", diff --git a/pkgs/by-name/sl/slsk-batchdl/package.nix b/pkgs/by-name/sl/slsk-batchdl/package.nix index fc1daf3ebb62..db12fabf934e 100644 --- a/pkgs/by-name/sl/slsk-batchdl/package.nix +++ b/pkgs/by-name/sl/slsk-batchdl/package.nix @@ -31,7 +31,19 @@ buildDotnetModule (finalAttrs: { # See: https://github.com/fiso64/sockseek/issues/111 # testProjectFile = "slsk-batchdl.Tests/slsk-batchdl.Tests.csproj"; - dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-sdk = + with dotnetCorePackages; + sdk_10_0 + // { + inherit + (combinePackages [ + sdk_10_0 + sdk_8_0 + ]) + packages + targetPackages + ; + }; nugetDeps = ./deps.json; executables = [ "sldl" ];