diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 42e1f738e470f7..051f11c519a9af 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -20,10 +20,7 @@ buildDotnetModule rec { fetchSubmodules = true; # It vendors BSIPA-Linux }; - dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index b3560f9ab7ed26..031567b5a87f35 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -36,11 +36,10 @@ buildDotnetModule (finalAttrs: rec { dotnet-sdk = with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_7_0 - sdk_8_0 - ]; + sdk_8_0 + // { + inherit (sdk_6_0) packages targetPackages; + }; dotnet-runtime = dotnetCorePackages.sdk_8_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index e1850133807c3c..de661cd58ba639 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -20,12 +20,7 @@ buildDotnetModule rec { projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_8_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetBuildFlags = [ diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 93161f889efd81..ad5241cf2ee8e8 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -26,7 +26,19 @@ buildDotnetModule rec { executables = [ "naps2" ]; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ]; + dotnet-sdk = + with dotnetCorePackages; + sdk_8_0 + // { + inherit + (combinePackages [ + sdk_8_0 + sdk_6_0 + ]) + packages + targetPackages + ; + }; dotnet-runtime = dotnetCorePackages.runtime_8_0; selfContainedBuild = true; runtimeDeps = [ diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 31dd4eed276fba..584993f7791262 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -12,12 +12,18 @@ let pname = "roslyn-ls"; dotnet-sdk = with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_7_0 - sdk_8_0 - sdk_9_0 - ]; + sdk_9_0 + // { + inherit + (combinePackages [ + sdk_8_0 + sdk_7_0 + sdk_6_0 + ]) + packages + targetPackages + ; + }; # need sdk on runtime as well dotnet-runtime = dotnetCorePackages.sdk_9_0; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 9ad8c3b335f606..704c706d0706fb 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -56,7 +56,12 @@ buildDotnetModule rec { }; # SDK 6.0 required for Robust.LoaderApi - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_8_0 sdk_6_0 ]; + dotnet-sdk = + with dotnetCorePackages; + sdk_8_0 + // { + inherit (sdk_8_0) packages targetPackages; + }; dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetFlags = [