gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove uneccessary uses of dotnetCorePackages.combinePackages (#362431)

Browse Source
This commit is contained in:
David McFarland
2024-12-12 18:07:37 -04:00
committed by GitHub
parent 7996b203f6 5b4d838e43
commit 6da8776012
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fs/fsautocomplete/package.nix
+2 -7
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" ];
pkgs/by-name/na/naps2/package.nix
+13 -1
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 = [
pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
+1 -2
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 = [