dotnet-sdk/runtime/aspnetcore: 6.0 -> 8.0

2024-11-21 22:43:01 +00:00 · 2024-10-27 22:17:17 -03:00 · 2024-10-27 22:17:17 -03:00 · bfaca46529
commit bfaca46529
parent 112a4c48c6
19 changed files with 44 additions and 6 deletions
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -729,6 +729,10 @@
  root. This is consistent with packaging guidelines and more friendly for FHS
  environments.

+- `dotnet-sdk`, `dotnet-runtime`, and `dotnet-aspnetcore` now point to dotnet 8
+  rather than dotnet 6. For packages that still need dotnet 6, use
+  `dotnet-sdk_6`, etc.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@ -1173,11 +1173,17 @@ rec {
      };

      fsi = writeBash "fsi" ''
+        set -euo pipefail
        export HOME=$NIX_BUILD_TOP/.home
        export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
        export DOTNET_CLI_TELEMETRY_OPTOUT=1
        export DOTNET_NOLOGO=1
+        export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1
        script="$1"; shift
+        (
+          ${lib.getExe dotnet-sdk} new nugetconfig
+          ${lib.getExe dotnet-sdk} nuget disable source nuget
+        ) > /dev/null
        ${lib.getExe dotnet-sdk} fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script"
      '';

--- 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-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0;

  nugetDeps = ./deps.nix;

--- a/pkgs/by-name/am/am2rlauncher/package.nix
+++ b/pkgs/by-name/am/am2rlauncher/package.nix
@ -18,6 +18,7 @@
 , glib-networking
 , wrapGAppsHook3
 , gsettings-desktop-schemas
+, dotnetCorePackages
 }:
 let
  am2r-run = buildFHSEnv {
@ -54,6 +55,7 @@ buildDotnetModule {
    hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj";

  nugetDeps = ./deps.nix;
--- a/pkgs/by-name/az/azure-functions-core-tools/package.nix
+++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix
@ -24,6 +24,7 @@ buildDotnetModule rec {
  pname = "azure-functions-core-tools";
  inherit src version;

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  dotnet-runtime = dotnetCorePackages.sdk_6_0;
  nugetDeps = ./deps.nix;
  useDotnetFromEnv = true;
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@ -3,6 +3,7 @@
  buildDotnetModule,
  fetchFromGitHub,
  z3,
+  dotnetCorePackages,
 }:

 buildDotnetModule rec {
@ -16,6 +17,7 @@ buildDotnetModule rec {
    hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = [ "Source/Boogie.sln" ];
  nugetDeps = ./deps.nix;

--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@ -1,6 +1,7 @@
 { lib
 , buildDotnetModule
 , fetchFromGitHub
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
    hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  nugetDeps = ./deps.nix;

  preFixup = ''
--- a/pkgs/by-name/da/dafny/package.nix
+++ b/pkgs/by-name/da/dafny/package.nix
@ -4,6 +4,7 @@
 , writeScript
 , jdk11
 , z3
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -40,6 +41,7 @@ buildDotnetModule rec {
        --replace-warn "netstandard2.0;net452" net6.0
    '';

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  buildInputs = [ jdk11 ];
  nugetDeps = ./deps.nix;

--- a/pkgs/by-name/fo/formula/package.nix
+++ b/pkgs/by-name/fo/formula/package.nix
@ -11,6 +11,7 @@ buildDotnetModule rec {
    sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  nugetDeps = ./nuget.nix;
  projectFile = "Src/CommandLine/CommandLine.csproj";

--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@ -1,6 +1,7 @@
 { lib
 , fetchFromGitHub
 , buildDotnetModule
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
    hash = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = "src/gei/gei.csproj";
  nugetDeps = ./deps.nix; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`.

--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@ -3,6 +3,7 @@
  , fetchFromGitHub
  , lib
  , openal
+  , dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -18,6 +19,7 @@ buildDotnetModule rec {

  patches = [ ./targetframework.patch ];

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  nugetDeps = ./deps.nix;
  executables = [ "Knossos.NET" ];

--- a/pkgs/by-name/kr/kryptor/package.nix
+++ b/pkgs/by-name/kr/kryptor/package.nix
@ -1,6 +1,7 @@
 { lib
 , buildDotnetModule
 , fetchFromGitHub
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
    hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = "src/Kryptor.sln";
  nugetDeps = ./deps.nix;

--- a/pkgs/by-name/ne/networkminer/package.nix
+++ b/pkgs/by-name/ne/networkminer/package.nix
@ -5,6 +5,7 @@
 , dos2unix
 , msbuild
 , mono
+, dotnetCorePackages
 }:
 buildDotnetModule rec {
  pname = "networkminer";
@ -17,6 +18,8 @@ buildDotnetModule rec {
    sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+
  nativeBuildInputs = [ unzip dos2unix msbuild ];

  patches = [
--- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix
+++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
@ -3,6 +3,7 @@
 , fetchFromGitHub
 , zlib
 , openssl
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -18,6 +19,7 @@ buildDotnetModule rec {

  selfContainedBuild = true;

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = "UI.Console/UI.Console.csproj";
  nugetDeps = ./deps.nix;

--- a/pkgs/by-name/vr/vrcadvert/package.nix
+++ b/pkgs/by-name/vr/vrcadvert/package.nix
@ -1,5 +1,6 @@
 {
  buildDotnetModule,
+  dotnetCorePackages,
  fetchFromGitHub,
  lib,
 }:
@ -15,6 +16,8 @@ buildDotnetModule rec {
    hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+
  nugetDeps = ./deps.nix;

  executables = [ "VrcAdvert" ];
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@ -5,7 +5,7 @@
  pytestCheckHook,
  pycparser,
  psutil,
-  dotnet-sdk,
+  dotnet-sdk_6,
  buildDotnetModule,
  clr-loader,
  setuptools,
@ -44,7 +44,7 @@ buildPythonPackage {

  nativeBuildInputs = [
    setuptools
-    dotnet-sdk
+    dotnet-sdk_6
  ];

  propagatedBuildInputs = [
--- a/pkgs/tools/X11/opentabletdriver/default.nix
+++ b/pkgs/tools/X11/opentabletdriver/default.nix
@ -14,6 +14,7 @@
 , wrapGAppsHook3
 , jq
 , coreutils
+, dotnetCorePackages
 }:

 buildDotnetModule rec {
@ -33,6 +34,7 @@ buildDotnetModule rec {

  dotnetInstallFlags = [ "--framework=net6.0" ];

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ];
  nugetDeps = ./deps.nix;

--- a/pkgs/tools/games/scarab/default.nix
+++ b/pkgs/tools/games/scarab/default.nix
@ -6,6 +6,7 @@
  copyDesktopItems,
  icoutils,
  makeDesktopItem,
+  dotnetCorePackages,
 }:

 buildDotnetModule rec {
@ -19,6 +20,7 @@ buildDotnetModule rec {
    sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI=";
  };

+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  nugetDeps = ./deps.nix;
  projectFile = "Scarab/Scarab.csproj";
  testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -431,9 +431,9 @@ with pkgs;
  dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0;
  dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0;

-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
-  dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnet-aspnetcore = dotnetCorePackages.aspnetcore_8_0;

  inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps;