dotnet: default to source-built sdk/runtimes

NixOS · Dec 8, 2024 · 31e7828 · 31e7828
1 parent ffd1002
commit 31e7828
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 64 deletions.
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -74,8 +74,8 @@ buildDotnetModule rec {
     ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
   '';
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_6_0-bin;
 
   projectFile = "ILSpy/ILSpy.csproj";
   nugetDeps = ./deps.nix;

diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
@@ -28,7 +28,7 @@ buildDotnetModule rec {
 
   patches = [./remove-project.patch];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
 
   nugetDeps = ./deps.nix;
 

diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
@@ -26,8 +26,8 @@ let
   dotnet-sdk =
     with dotnetCorePackages;
     combinePackages [
-      sdk_7_0_1xx
-      runtime_6_0
+      sdk_7_0_1xx-bin
+      runtime_6_0-bin
     ];
 
   npmDepsFile = ./npm-deps.nix;

diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix
@@ -24,8 +24,8 @@ buildDotnetModule rec {
   pname = "azure-functions-core-tools";
   inherit src version;
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.sdk_6_0-bin;
   nugetDeps = ./deps.nix;
   useDotnetFromEnv = true;
   executables = [ "func" ];

diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix
@@ -21,11 +21,11 @@ buildDotnetModule rec {
   };
 
   dotnet-sdk = with dotnetCorePackages; combinePackages [
-    sdk_7_0
-    sdk_6_0
+    sdk_7_0-bin
+    sdk_6_0-bin
   ];
 
-  dotnet-runtime = dotnetCorePackages.runtime_7_0;
+  dotnet-runtime = dotnetCorePackages.runtime_7_0-bin;
 
   projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ];
 

diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
@@ -26,7 +26,7 @@ buildDotnetModule rec {
 
   nugetDeps = ./deps.nix;
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin;
 
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 

diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix
@@ -9,8 +9,8 @@ let
   pname = "bililiverecorder";
 
   dotnet = with dotnetCorePackages; combinePackages [
-    runtime_6_0
-    aspnetcore_6_0
+    runtime_6_0-bin
+    aspnetcore_6_0-bin
   ];
 
   version = "2.13.0";

diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   postFixup = if stdenv.hostPlatform.isLinux then ''
     mv $out/bin/CommandLine $out/bin/formula
   '' else lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \
+    makeWrapper ${dotnetCorePackages.runtime_6_0-bin}/bin/dotnet $out/bin/formula \
       --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
       --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
   '';

diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix
@@ -22,8 +22,8 @@ buildDotnetModule rec {
   nugetDeps = ./deps.nix;
   executables = [ "inklecate" ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_6_0-bin;
 
   meta = with lib; {
     description = "Compiler for ink, inkle's scripting language";

diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
@@ -25,7 +25,7 @@ buildDotnetModule rec {
 
   nugetDeps = ./deps.nix;
 
-  dotnet-sdk = dotnetCorePackages.sdk_7_0;
+  dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
 
   selfContainedBuild = true;
 

diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix
@@ -2,7 +2,7 @@
 
 let
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
 
   xplat = fetchurl {
     url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip";

diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix
@@ -26,7 +26,7 @@ buildDotnetModule rec {
 
   executables = [ "naps2" ];
 
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ];
+  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0-bin sdk_8_0 ];
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
   selfContainedBuild = true;
   runtimeDeps = [

diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix
@@ -30,8 +30,8 @@ buildDotnetModule rec {
 
   executables = [ "PabloDraw" ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_7_0;
-  dotnet-runtime = dotnetCorePackages.runtime_7_0;
+  dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_7_0-bin;
 
   nugetDeps = ./deps.nix;
 

diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -12,6 +12,7 @@ let
   pname = "roslyn-ls";
   dotnet-sdk =
     with dotnetCorePackages;
+<<<<<<< HEAD
     sdk_9_0
     // {
       inherit
@@ -26,6 +27,21 @@ let
         targetPackages
         ;
     };
+||||||| parent of d4282248b2bc (dotnet: default to source-built sdk/runtimes)
+    combinePackages [
+      sdk_6_0
+      sdk_7_0
+      sdk_8_0
+      sdk_9_0
+    ];
+=======
+    combinePackages [
+      sdk_6_0-bin
+      sdk_7_0-bin
+      sdk_8_0
+      sdk_9_0
+    ];
+>>>>>>> d4282248b2bc (dotnet: default to source-built sdk/runtimes)
   # need sdk on runtime as well
   dotnet-runtime = dotnetCorePackages.sdk_9_0;
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system;

diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix
@@ -17,7 +17,7 @@ buildDotnetModule rec {
     hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
 
   projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ];
 

diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix
@@ -34,7 +34,7 @@ buildDotnetModule rec {
 
   enableParallelBuilding = false;
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
   nugetDeps = ./deps.nix;

diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
@@ -69,8 +69,8 @@ buildDotnetModule {
 
   runtimeDeps = [ sqlite ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin;
 
   doCheck = true;
 

diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix
@@ -19,7 +19,7 @@ buildDotnetModule rec {
     "-p:PublishSingleFile=false"
   ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
   runtimeDeps = [ ffmpeg-full ];
 
   meta = with lib; {

diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix
@@ -22,8 +22,8 @@ buildDotnetModule rec {
   projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj";
   nugetDeps = ./deps.nix;
 
-  dotnet-sdk = dotnetCorePackages.sdk_7_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
+  dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin;
 
   buildInputs = [(lib.getLib stdenv.cc.cc) zlib];
 

diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix
@@ -5,5 +5,5 @@
   releaseInfoFile = ./release-info.json;
   bootstrapSdkFile = ./bootstrap-sdk.nix;
   depsFile = ./deps.nix;
-  fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages;
+  fallbackTargetPackages = dotnetCorePackages.sdk_8_0-bin.targetPackages;
 }
diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix
@@ -6,5 +6,5 @@
   bootstrapSdkFile = ./bootstrap-sdk.nix;
   allowPrerelease = true;
   depsFile = ./deps.nix;
-  fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages;
+  fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages;
 }
diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix
@@ -18,7 +18,7 @@ in
 assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
   You must include at least one package, e.g
         `with dotnetCorePackages; combinePackages [
-            sdk_6_0 aspnetcore_7_0
+            sdk_6_0-bin aspnetcore_7_0-bin
          ];`'';
 mkWrapper "sdk" (buildEnv {
   name = "dotnet-combined";

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
@@ -1,6 +1,6 @@
 /*
   How to combine packages for use in development:
-  dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ];
+  dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0-bin aspnetcore_7_0-bin ];
 
   Hashes and urls are retrieved from:
   https://dotnet.microsoft.com/download/dotnet
@@ -33,10 +33,14 @@ makeScopeWithSplicing' {
         };
 
       ## Files in versions/ are generated automatically by update.sh ##
-      dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix;
-      dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix;
-      dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix;
-      dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix;
+      dotnet-bin = lib.mergeAttrsList (
+        map buildDotnetSdk [
+          ./versions/6.0.nix
+          ./versions/7.0.nix
+          ./versions/8.0.nix
+          ./versions/9.0.nix
+        ]
+      );
 
       runtimeIdentifierMap = {
         "x86_64-linux" = "linux-x64";
@@ -48,7 +52,19 @@ makeScopeWithSplicing' {
       };
 
     in
-    {
+    lib.optionalAttrs config.allowAliases (
+      {
+        # EOL
+        sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
+        sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
+        sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
+        sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
+        sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
+      }
+      // dotnet-bin
+    )
+    // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) dotnet-bin
+    // rec {
       inherit callPackage fetchNupkg buildDotnetSdk;
 
       # Convert a "stdenv.hostPlatform.system" to a dotnet RID
@@ -69,18 +85,16 @@ makeScopeWithSplicing' {
 
       dotnet_8 = recurseIntoAttrs (callPackage ./8 { });
       dotnet_9 = recurseIntoAttrs (callPackage ./9 { });
+
+      sdk_8_0 = dotnet_8.sdk;
+      sdk_8_0_1xx = dotnet_8.sdk;
+      runtime_8_0 = dotnet_8.runtime;
+      aspnetcore_8_0 = dotnet_8.aspnetcore;
+
+      sdk_9_0 = dotnet_9.sdk;
+      sdk_9_0_1xx = dotnet_9.sdk;
+      runtime_9_0 = dotnet_9.runtime;
+      aspnetcore_9_0 = dotnet_9.aspnetcore;
     }
-    // lib.optionalAttrs config.allowAliases {
-      # EOL
-      sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
-      sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
-      sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
-      sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
-      sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)";
-    }
-    // dotnet_6_0
-    // dotnet_7_0
-    // dotnet_8_0
-    // dotnet_9_0
   );
 }
diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix
@@ -37,13 +37,13 @@ buildPythonPackage {
 
   format = "pyproject";
 
-  buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps;
+  buildInputs = dotnetCorePackages.sdk_6_0-bin.packages ++ dotnet-build.nugetDeps;
 
   nativeBuildInputs = [
     setuptools
     setuptools-scm
     wheel
-    dotnetCorePackages.sdk_6_0
+    dotnetCorePackages.sdk_6_0-bin
   ];
 
   propagatedBuildInputs = [ cffi ];

diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
@@ -26,8 +26,8 @@ buildDotnetModule rec {
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
   env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_6_0-bin;
 
   projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj";
   nugetDeps = ./deps.nix;

diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix
@@ -17,8 +17,8 @@ buildDotnetModule rec {
 
   nugetDeps = engine.deps;
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_6_0-bin;
 
   useAppHost = false;
 

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
@@ -56,7 +56,7 @@ buildDotnetModule rec {
   };
 
   # SDK 6.0 required for Robust.LoaderApi
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_8_0 sdk_6_0 ];
+  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_8_0 sdk_6_0-bin ];
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
   dotnetFlags = [

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
@@ -27,8 +27,8 @@ buildDotnetModule rec {
   # Fixes application reporting 0.0.0.0 as its version.
   MINVERVERSIONOVERRIDE = version;
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin;
 
   nativeBuildInputs = [ git glibcLocales bintools ];
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -413,18 +413,18 @@ with pkgs;
 
   dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
 
-  dotnet-sdk_6 = dotnetCorePackages.sdk_6_0;
-  dotnet-sdk_7 = dotnetCorePackages.sdk_7_0;
+  dotnet-sdk_6 = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-sdk_7 = dotnetCorePackages.sdk_7_0-bin;
   dotnet-sdk_8 = dotnetCorePackages.sdk_8_0;
   dotnet-sdk_9 = dotnetCorePackages.sdk_9_0;
 
-  dotnet-runtime_6 = dotnetCorePackages.runtime_6_0;
-  dotnet-runtime_7 = dotnetCorePackages.runtime_7_0;
+  dotnet-runtime_6 = dotnetCorePackages.runtime_6_0-bin;
+  dotnet-runtime_7 = dotnetCorePackages.runtime_7_0-bin;
   dotnet-runtime_8 = dotnetCorePackages.runtime_8_0;
   dotnet-runtime_9 = dotnetCorePackages.runtime_9_0;
 
-  dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0;
-  dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0;
+  dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0-bin;
+  dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0-bin;
   dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0;
   dotnet-aspnetcore_9 = dotnetCorePackages.aspnetcore_9_0;