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

This commit is contained in:
David McFarland 2024-10-27 22:17:17 -03:00
parent 112a4c48c6
commit bfaca46529
19 changed files with 44 additions and 6 deletions

View File

@ -729,6 +729,10 @@
root. This is consistent with packaging guidelines and more friendly for FHS root. This is consistent with packaging guidelines and more friendly for FHS
environments. 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} ## 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. --> <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@ -1173,11 +1173,17 @@ rec {
}; };
fsi = writeBash "fsi" '' fsi = writeBash "fsi" ''
set -euo pipefail
export HOME=$NIX_BUILD_TOP/.home export HOME=$NIX_BUILD_TOP/.home
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1 export DOTNET_NOLOGO=1
export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1
script="$1"; shift 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" ${lib.getExe dotnet-sdk} fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script"
''; '';

View File

@ -28,7 +28,7 @@ buildDotnetModule rec {
patches = [./remove-project.patch]; patches = [./remove-project.patch];
dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -18,6 +18,7 @@
, glib-networking , glib-networking
, wrapGAppsHook3 , wrapGAppsHook3
, gsettings-desktop-schemas , gsettings-desktop-schemas
, dotnetCorePackages
}: }:
let let
am2r-run = buildFHSEnv { am2r-run = buildFHSEnv {
@ -54,6 +55,7 @@ buildDotnetModule {
hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj";
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -24,6 +24,7 @@ buildDotnetModule rec {
pname = "azure-functions-core-tools"; pname = "azure-functions-core-tools";
inherit src version; inherit src version;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
useDotnetFromEnv = true; useDotnetFromEnv = true;

View File

@ -3,6 +3,7 @@
buildDotnetModule, buildDotnetModule,
fetchFromGitHub, fetchFromGitHub,
z3, z3,
dotnetCorePackages,
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -16,6 +17,7 @@ buildDotnetModule rec {
hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE="; hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = [ "Source/Boogie.sln" ]; projectFile = [ "Source/Boogie.sln" ];
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildDotnetModule , buildDotnetModule
, fetchFromGitHub , fetchFromGitHub
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg="; hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
preFixup = '' preFixup = ''

View File

@ -4,6 +4,7 @@
, writeScript , writeScript
, jdk11 , jdk11
, z3 , z3
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -40,6 +41,7 @@ buildDotnetModule rec {
--replace-warn "netstandard2.0;net452" net6.0 --replace-warn "netstandard2.0;net452" net6.0
''; '';
dotnet-sdk = dotnetCorePackages.sdk_6_0;
buildInputs = [ jdk11 ]; buildInputs = [ jdk11 ];
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -11,6 +11,7 @@ buildDotnetModule rec {
sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./nuget.nix; nugetDeps = ./nuget.nix;
projectFile = "Src/CommandLine/CommandLine.csproj"; projectFile = "Src/CommandLine/CommandLine.csproj";

View File

@ -1,6 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, buildDotnetModule , buildDotnetModule
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
hash = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE="; hash = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = "src/gei/gei.csproj"; projectFile = "src/gei/gei.csproj";
nugetDeps = ./deps.nix; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. nugetDeps = ./deps.nix; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`.

View File

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, openal , openal
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -18,6 +19,7 @@ buildDotnetModule rec {
patches = [ ./targetframework.patch ]; patches = [ ./targetframework.patch ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
executables = [ "Knossos.NET" ]; executables = [ "Knossos.NET" ];

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildDotnetModule , buildDotnetModule
, fetchFromGitHub , fetchFromGitHub
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -14,6 +15,7 @@ buildDotnetModule rec {
hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8="; hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = "src/Kryptor.sln"; projectFile = "src/Kryptor.sln";
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -5,6 +5,7 @@
, dos2unix , dos2unix
, msbuild , msbuild
, mono , mono
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
pname = "networkminer"; pname = "networkminer";
@ -17,6 +18,8 @@ buildDotnetModule rec {
sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nativeBuildInputs = [ unzip dos2unix msbuild ]; nativeBuildInputs = [ unzip dos2unix msbuild ];
patches = [ patches = [

View File

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, zlib , zlib
, openssl , openssl
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -18,6 +19,7 @@ buildDotnetModule rec {
selfContainedBuild = true; selfContainedBuild = true;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = "UI.Console/UI.Console.csproj"; projectFile = "UI.Console/UI.Console.csproj";
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -1,5 +1,6 @@
{ {
buildDotnetModule, buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub, fetchFromGitHub,
lib, lib,
}: }:
@ -15,6 +16,8 @@ buildDotnetModule rec {
hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ="; hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
executables = [ "VrcAdvert" ]; executables = [ "VrcAdvert" ];

View File

@ -5,7 +5,7 @@
pytestCheckHook, pytestCheckHook,
pycparser, pycparser,
psutil, psutil,
dotnet-sdk, dotnet-sdk_6,
buildDotnetModule, buildDotnetModule,
clr-loader, clr-loader,
setuptools, setuptools,
@ -44,7 +44,7 @@ buildPythonPackage {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
dotnet-sdk dotnet-sdk_6
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -14,6 +14,7 @@
, wrapGAppsHook3 , wrapGAppsHook3
, jq , jq
, coreutils , coreutils
, dotnetCorePackages
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -33,6 +34,7 @@ buildDotnetModule rec {
dotnetInstallFlags = [ "--framework=net6.0" ]; dotnetInstallFlags = [ "--framework=net6.0" ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ]; projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ];
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

View File

@ -6,6 +6,7 @@
copyDesktopItems, copyDesktopItems,
icoutils, icoutils,
makeDesktopItem, makeDesktopItem,
dotnetCorePackages,
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -19,6 +20,7 @@ buildDotnetModule rec {
sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI="; sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_6_0;
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
projectFile = "Scarab/Scarab.csproj"; projectFile = "Scarab/Scarab.csproj";
testProjectFile = "Scarab.Tests/Scarab.Tests.csproj"; testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";

View File

@ -431,9 +431,9 @@ with pkgs;
dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0;
dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0;
dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_8_0;
inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps; inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps;