nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: remove uneccessary uses of dotnetCorePackages.combinePackages

Browse Source
This commit is contained in:
David McFarland 2024-10-27 13:43:47 -03:00
parent 8bbf8450e4
commit 5b4d838e43
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/by-name/fs/fsautocomplete/package.nix
View File

@ -26,13 +26,8 @@ buildDotnetModule (finalAttrs: rec {
--replace-fail TargetFrameworks TargetFramework \
'';
dotnet-sdk =
with dotnetCorePackages;
combinePackages [
sdk_8_0
sdk_9_0
];
dotnet-runtime = dotnetCorePackages.sdk_9_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.sdk_8_0;
projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj";
executables = [ "fsautocomplete" ];

14
pkgs/by-name/na/naps2/package.nix
View File

@ -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 = [

3
pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
View File

@ -55,8 +55,7 @@ buildDotnetModule rec {
updateScript = ./update.sh;
};
# SDK 6.0 required for Robust.LoaderApi
dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_8_0 sdk_6_0 ];
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetFlags = [