diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 7b02b92b3c650..72a7eed3fb7b3 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -17,6 +17,7 @@ let finalAttrs: { enableParallelBuilding ? true, + strictDeps ? true, # Flags to pass to `makeWrapper`. This is done to avoid double wrapping. makeWrapperArgs ? [ ], @@ -127,6 +128,7 @@ let inherit enableParallelBuilding + strictDeps dotnetRestoreFlags dotnetBuildFlags dotnetTestFlags diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index e589804fbe322..1110e01f7dd93 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -52,8 +52,7 @@ { name = "dotnet-fixup-hook"; substitutions = { - # this is used for DOTNET_ROOT, so we need unwrapped - dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime.unwrapped else null; + dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; wrapperPath = lib.makeBinPath [ which coreutils ]; }; } diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix index e653bbb0376c0..dc80fac2f8601 100644 --- a/pkgs/build-support/dotnet/fetch-nupkg/default.nix +++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix @@ -35,6 +35,8 @@ lib.makeOverridable ( ; }; + strictDeps = true; + nativeBuildInputs = [ unzip patchNupkgs diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index 4cf9c1a7412af..a4a8379417604 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -9,6 +9,8 @@ stdenvNoCC.mkDerivation (lib.recursiveUpdate { inherit name; + strictDeps = true; + nativeBuildInputs = [ python3 ]; buildCommand = '' diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 42e1f738e470f..051f11c519a9a 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -20,10 +20,7 @@ buildDotnetModule rec { fetchSubmodules = true; # It vendors BSIPA-Linux }; - dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 2e3b0c1e911ef..6119aaf637410 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -42,7 +42,7 @@ buildDotnetModule rec { ''; dotnet-sdk = dotnetCorePackages.sdk_6_0; - buildInputs = [ jdk11 ]; + nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; # Build just these projects. Building Source/Dafny.sln includes a bunch of diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix index 2570178588bb9..8979f81366091 100644 --- a/pkgs/by-name/do/dotnet-outdated/package.nix +++ b/pkgs/by-name/do/dotnet-outdated/package.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, }: buildDotnetModule rec { pname = "dotnet-outdated"; @@ -24,7 +25,10 @@ buildDotnetModule rec { executables = "dotnet-outdated"; dotnetFlags = [ "-p:TargetFrameworks=net8.0" ]; - dotnetInstallFlags = [ "--framework" "net8.0" ]; + dotnetInstallFlags = [ + "--framework" + "net8.0" + ]; meta = with lib; { description = ".NET Core global tool to display and update outdated NuGet packages in a project"; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 310ec6a8bc342..a0c7be275547b 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -32,7 +32,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8.unwrapped}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index b3560f9ab7ed2..031567b5a87f3 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -36,11 +36,10 @@ buildDotnetModule (finalAttrs: rec { dotnet-sdk = with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_7_0 - sdk_8_0 - ]; + sdk_8_0 + // { + inherit (sdk_6_0) packages targetPackages; + }; dotnet-runtime = dotnetCorePackages.sdk_8_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index e1850133807c3..de661cd58ba63 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -20,12 +20,7 @@ buildDotnetModule rec { projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_8_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetBuildFlags = [ diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 9b71405f33546..8e961ec2bd58a 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -1,5 +1,7 @@ { + bash, buildDotnetModule, + coreutils, darwin, dotnetCorePackages, fetchFromGitHub, @@ -111,12 +113,17 @@ buildDotnetModule rec { [ which git + # needed for `uname` + coreutils ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + bash + ]; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 93161f889efd8..ad5241cf2ee8e 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -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 = [ diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index 48d62500e1163..6b9773cb60dbd 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -36,7 +36,7 @@ let cmakeFlags = [ "-DCORECLR_DIR=${coreclr-src}/src/coreclr" - "-DDOTNET_DIR=${dotnet-sdk.unwrapped}/share/dotnet" + "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet" "-DBUILD_MANAGED=0" ]; }; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index c5c62a54499f7..a35ffa3072dd8 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -93,7 +93,7 @@ buildPythonApplication rec { VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 # Resolve `.NET location: Not found` errors for dotnet tests - export DOTNET_ROOT="${dotnet-sdk.unwrapped}/share/dotnet" + export DOTNET_ROOT="${dotnet-sdk}/share/dotnet" export HOME=$(mktemp -d) diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix index a8074cef40747..fa4074b8a5249 100644 --- a/pkgs/by-name/ta/tagger/package.nix +++ b/pkgs/by-name/ta/tagger/package.nix @@ -31,11 +31,11 @@ buildDotnetModule rec { nativeBuildInputs = [ blueprint-compiler - libadwaita ]; buildInputs = [ chromaprint + libadwaita ]; runtimeDeps = [ diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix index 5b4df9e7c494b..649caa56b3cfd 100644 --- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -12,6 +12,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha512-dQn8Z1iypqdntr/hfuuEt2qCdJZywJtociOEnl+jRp2wyEJcQNGBtNQfDT2LWqNj/tJjSY+a+ncuXT3UnnQvjQ=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha512-cA9+iEQ0AikuCnRJ0ASaZbPPpVAINzbEbwR5I4fx2wrch2cdARdSwP3CQK1OAeR8IfA2EEm1jKpgT5fLJ7emHQ=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.10"; hash = "sha512-N3VO3kok4zHBI6gQC0+x6e/36ebf6xa6dIEzxMnuF/GGEgjseDNBSRI6/Ta/ACRR2LzwDE1CcLp5leBzxMkyAw=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "8.0.10"; hash = "sha512-VJUmnC22ZvY5HsjeYZ7XEaBlfHVfkP9n+zFTDg9UftVlHOwJm8PdecavJFpNBM692i0vicgHjn8xuQYShuwZ4g=="; }) ]; hostPackages = { @@ -145,6 +146,7 @@ let (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha512-D3hpY5NnpvIg4fNVKcJYYUwxfaFY8AHTvYzwT0D0tb0qcXKIMsJEm7lRM2vsENuhHn02tWTvsyRuo5h9XmmG/g=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha512-pMagTteRJ2XwPeJnonPRvA5A4v3f4F+X1iu08RxPwTXVDsS4xemkm1LfZgiyPADIrAsY6DBFLXvK5fZ0uaBigA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha512-fprLJDM1dWKqI3n2DjCVSY8l7zBngdjnLid8HZxdHn1Hr9m57k4wcbFc/otHfnTHcYF0MXPrC6VO4CgRYFtIkA=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha512-MFsFM8Xsx/e7MQdJv/2S8mLEigaqyurnE5lNdzKFft0htVKnPx6DpTbi0k8P6RmWcpoO3KKivj310st7M4IxBQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha512-aBIdHUFn4vBEIN/v9+8ix+C/7Ljrb9zgFp6naPO37XlvGTuOgYm4tc2hfs1wbjc3VxaC2Gzc2smzUwahicAM6A=="; }) @@ -155,6 +157,7 @@ let (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha512-VY6rMwR9QzRKhuUVBCFSVwPBPIqH20C+F4W2R6KP0GajGfu6h1/AdtnJS0op+76fIg0qia8JFuW6DUhc3UmSLQ=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha512-yWJ8LOGQ1/pKyT/qHjGkU+RuWmCy9OsUe/ANtHA5kTHmY4g4RNwP8+eDW1K3+g5BESfaENlJiNiTnWwTn2CFQQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.10"; hash = "sha512-qrxC9S51t2w84jLBttmTmLmS1KjHscP31REqw8I117VnX/R7861Aabj7gg0cVz6YiGaeBqgzuUt/yBiHu18xeQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha512-wxE7rlCvX781atu3tdx5zXib8/Yr1uyjg9aUFrXtIBhMRRfEEUQ0NaW3Njonhi5Tf3JF8lXiUEX1COvRxsCFSQ=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha512-NGl4nsuWJgLBQobSkbOxJgkT04uyetP/Kv8JXz7qN6MV0q+MjyhYQY29H8ODQgSMi4viOBL9KHbrTc6K+oSD7w=="; }) @@ -165,6 +168,7 @@ let (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha512-Mp2Scz97QbDE1CKZli/Z4zDSeQGSjN4vuylZUqvLukTTGTM1xB89a0TLf5ooz6rZefyNecAY2WOP0fr+oOjpPg=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha512-Voo3Y/uZNEaiWfePrWjKkpsgZBR1dmgwuCf/8sxMCSQ2MvVG5jYlb0z+LqQdWQnF35fPHDFOCKeXIek20hPFtA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.10"; hash = "sha512-00BocEhDPtq4wrrkK4TN4uC0JLQvLn+JZpEAanMEQzN/ZOb8pP8c4RX/jNpPP40MqNNnsNOSFh9C2LE/HPgjHA=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha512-5322ID0jxoDa/ehLGbr6RkE7GNs0lLGQ9M/YvmHyPxWZfWq+b9OXMVkGqpAjF+3hp3a77yoFGBYGEtBKLI7jHA=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix index 1c9f412d4f910..5659d84235009 100644 --- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -9,6 +9,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-tJYYbEootDwmS23jQtXRN/HrkN57sLdcpjYuKjqzgOsWVhVYr+5Yq5vcuYa03RiRv/PnoOmWB6pMhQ69qfIhcA=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-7gm4DUCtrapDZxO1aKiPGm/danAxKvGiCyj16+4zdgD69S0UJ0mwQw5Mn7xIhrz3/YSC/yK7ihvZ4oqc4I00aQ=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-h08RQolDzXy4ihvbyEb0E75pozEG/tyZgPaKEfWGtEM1Byvbe4SDrQlu0G4f97h5I49L6Czy+RQ+rdnyL/XwjQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "9.0.0-rc.2.24474.4"; hash = "sha512-WeoUwf3g/wdlyd6DB98+0y4ztWFlg3IP+yXGhV2Hy6XJJTYVELdCrDefL1L5INfozshNFI63rEUrEbItcyR2gA=="; }) ]; hostPackages = { @@ -109,18 +110,21 @@ let (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-tKSRJQ4E/PndHyAEKnDitBvgTnJCtzIBiw4MAim7mmdO3T3xCq3N1PP/WRST+JEMDy19tkLwClR3SqziiXPAag=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-gNMyW8t/1pBYNWwZpW7Gk4GArSEVrJOCBz8YvaHpzwk9iuVYeka4lOIvudA9drCxY5EUU1I20EJvCSycNffgsg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-FiXMi1dtVF47L4ITblPzzCbgLY9noHwV0ZvEL30bgm4hQPSSNdELFbDAgNuAktieV3/XV7KSOQPPxlc6KEZi2w=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24474.4"; hash = "sha512-8679z3waMYSYVmBMB3HHwRAbow8ssM1Aau2XBmF7A1oUVvhU8Nodl51TzZmgLIT/UOSSqNYRqvPznGnPiVk6JA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha512-8FXl5YY++/bGTAOoAS7lK53CXyc7vzLAzfmXQ3q2s4vLvrKI3720ECDnDQS9Of9P8ZLDdMwX6SeHd4RbsLMaBg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-P4A/HDIrDVLJBtBD9Eoy2DxofmLXji5zzOBA9ZEWioXurCU5ujFw2VhUiKY6qDedFsq6/1IyVGDNcesd42jgmQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-lCAvZbxLspyp1LgfAE8uCvd9muUNGK1XRAo62v7cxhMDrCopNPF4F36nRQq+LBbyijlCbXzHmB7FJ5SfcQYhfA=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-UUoAim2OxX0npr5wF3z9mLunFVVNyfadk5EyE8dkTAhiSULv4mzQhAMRLirPlnOOcvytVgrixBWmE+unUrjJrA=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "9.0.0-rc.2.24474.4"; hash = "sha512-kz+ygB7ZcfFXL+Je1eGw2+PQkUI+1OID32VKZ1IQ548hR1m4Dx/RVVVuYlty/bUsrUeep4lqafQwA4ZZeBf7gA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24474.3"; hash = "sha512-xuLmBBnsSd915EIhwY4x8UP6LKvVrbTP5Stx6zn12ZE9wf0mzrp92o4zs9xdS+XFjV4sXgPdJ00ayj8vRtqaew=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-e0Rk0Kg5yGi/gv6pBGuGca860xeOTOMjx+A+5xvB6NLaPS7bdAuGgFRhiI0Bs1s8KcuEhnWK4EP8Z9127BR54A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-BU8bppDcPbtBi0WtF8WpGPDf10l+LwB/i/sBYmvmKtGymDkUTZ1Cx535oPA7c0vRfTYFbPZPNEZwlmtQj+gaRQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha512-zIGe6kxRaO8J+OU5LLvxUO1BMu3+GuTcS87aUggVNulwyHFjm60YS69VSpQ0JyWy5/m2cNTcTgcwRNAmU6He/g=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "9.0.0-rc.2.24474.4"; hash = "sha512-/CnYW1lQJ4npbgzEOOXXZcoO1bZxTmmi7uTNIZHOUFTlzaKXFtF42swUSnDThheshzHMQq87O6fmJCwCjpyzbg=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index ede86ad04eb47..5b24e2d58cb0b 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -101,14 +101,16 @@ mkWrapper type ( stdenv.mkDerivation rec { inherit pname version; + strictDeps = true; + # Some of these dependencies are `dlopen()`ed. nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (type == "sdk") xmlstarlet ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ - xmlstarlet sigtool ]; @@ -118,7 +120,6 @@ mkWrapper type ( icu libkrb5 curl - xmlstarlet ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 2b5554b2eb94e..b745a40e878f6 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -4,6 +4,7 @@ dotnetPackages: makeWrapper, lib, symlinkJoin, + callPackage, }: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: @@ -12,15 +13,16 @@ dotnetPackages: # 3. Something else? let cli = builtins.head dotnetPackages; + mkWrapper = callPackage ./wrapper.nix { }; 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 ];`''; -(buildEnv { - name = "dotnet-core-combined"; - paths = map (x: x.unwrapped) dotnetPackages; +mkWrapper "sdk" (buildEnv { + name = "dotnet-combined"; + paths = dotnetPackages; pathsToLink = map (x: "/share/dotnet/${x}") [ "host" "packs" @@ -34,7 +36,7 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' postBuild = '' mkdir -p "$out"/share/dotnet - cp "${cli.unwrapped}"/share/dotnet/dotnet $out/share/dotnet + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet cp -R "${cli}"/nix-support "$out"/ mkdir "$out"/bin ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet @@ -43,6 +45,8 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' ln -s ${cli.man} $man ''; passthru = { + pname = "dotnet"; + version = "combined"; inherit (cli) icu; versions = lib.catAttrs "version" dotnetPackages; @@ -53,9 +57,4 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' }; inherit (cli) meta; -}).overrideAttrs - ({ - outputs = [ - "out" - ] ++ lib.optional (cli ? man) "man"; - }) +}) diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 2a61a5cb01ed9..3c748ee0eee54 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -36,6 +36,8 @@ let hash = artifactsHash; }; + strictDeps = true; + sourceRoot = "."; installPhase = '' diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index e8819a14611cc..25129a9fb3ba8 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -19,6 +19,7 @@ let stdenvNoCC.mkDerivation ( args // { + strictDeps = true; outputs = args.outputs or [ "out" ] ++ [ "man" ]; postFixup = args.postFixup or "" @@ -41,6 +42,8 @@ let src = vmr; dontUnpack = true; + strictDeps = true; + nativeBuildInputs = [ xmlstarlet nugetPackageHook diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 4fa837a4a2749..a5b19b48c2e1f 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -23,6 +23,8 @@ let pkg = stdenvNoCC.mkDerivation { name = "update-dotnet-vmr-env"; + strictDeps = true; + nativeBuildInputs = [ nix curl diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 7e8e6bfc880fe..f22b4b6bbbb26 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -220,6 +220,29 @@ netcore_target_packages () { generate_package_list "$version" ' ' "${pkgs[@]}" } +windowsdesktop_packages () { + local version=$1 + local pkgs=( + Microsoft.WindowsDesktop.App.Ref + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +windowsdesktop_target_packages () { + local version=$1 + local rid=$2 + local pkgs=() + + if [[ "$rid" = win-* ]]; then + pkgs+=( + "Microsoft.WindowsDesktop.App.Runtime.$rid" + ) + fi + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + usage () { echo "Usage: $pname [[--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions @@ -265,12 +288,13 @@ update() { fi local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version + local release_content aspnetcore_version runtime_version windowsdesktop_version local -a sdk_versions release_content=$(release "$content" "$major_minor_patch") aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + windowsdesktop_version=$(jq -r '.windowsdesktop.version' <<< "$release_content") if [[ -n $sdk ]]; then sdk_versions=("$sem_version") @@ -319,6 +343,7 @@ let commonPackages = [" aspnetcore_packages "${aspnetcore_version}" netcore_packages "${runtime_version}" + windowsdesktop_packages "${windowsdesktop_version}" echo " ]; hostPackages = {" @@ -334,6 +359,7 @@ let echo " $rid = [" aspnetcore_target_packages "${aspnetcore_version}" "$rid" netcore_target_packages "${runtime_version}" "$rid" + windowsdesktop_target_packages "${windowsdesktop_version}" "$rid" echo " ];" done echo " }; diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 7ad4096366437..db976b55db3e6 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -10,6 +10,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.36"; hash = "sha512-CPrQHhIPxgLjXv+SYqmCrtTrcarX5vol33mjalvNDb2z7Vml7LFT7oJk/Cf+GXZq6uBeNt/GOwXnvIaYe/1chQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.36"; hash = "sha512-cBd1pSGW7JD53svFRupX19RDqToI/p+ZVwoWW6CYmgoFcDc1Ms9JQObfO2Pam4s41xrc1hABjpwl8VVMXU9Erw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.36"; hash = "sha512-Qv57NzPUsP3MPleNrUhisnnSaKf3EyHoiEpObs9jy/ohgo3seMDbjOq8EA1hifx5Dxiw0P3DSbVpaiCwNF5sJQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "6.0.36"; hash = "sha512-0JRZrVwwDsYQbue5o0tO10sfzjO7UGAjFPTRcKT/QzyPDljnGeiATrADhPoeNCi6tsmEpafmlEIkJiH+SbKMyQ=="; }) ]; hostPackages = { @@ -135,6 +136,7 @@ let (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.36"; hash = "sha512-SxUYXhhM/fGkb08i21KbXT2hyedzb+Mf3wcBmFg4NTteRdbt5KWuUD+DCe9Z6Bbmr50H8T7EgOS/QIW96HZzIA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.36"; hash = "sha512-RRKTjZYWik95UGSRROy5BvwfpBYd+gAQi4XQUuc3vi90TQGxrz/OlPjD9bPPZ4Pr8H/PB7Y3bUrfKnmcs8OOJQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.36"; hash = "sha512-SewnE02UhqILbpoLxVkL+FLaCCu+EJ/SmR3DwFhAwFPX+47mPB1tLYW5IBDIcT/jbo9JCQaQ+DWdaW2Ghq7m5w=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "6.0.36"; hash = "sha512-+Gokybbp6YExCOIPClS5iK9ogzvNrvQHiRmh+q0IsETjIq9DwtG+E78MxxhYRKzKRK8uCFbvERpVttNfEbFm2Q=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.36"; hash = "sha512-XS0rzgotxL8fojceQ7zeYlmVRqSqRuP3SMJymXpIS45R8dnlpEooDfjjWRMAvyWkscmAmXQRI4f/UItGsTND5g=="; }) @@ -145,6 +147,7 @@ let (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.36"; hash = "sha512-mgAXyAMIdlx09SyTLILzYHZBKJKpLdhGAsfhftLTkjV7dLqMa1hLeI0L4z5L0Qh45+kySfWirfLCrbXYPCoHbw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.36"; hash = "sha512-LUx67cKuFJR2rKoTmb/GCwSmSYFX0ZitgjxacIfkZvhcsqOu1Sj1MYNmDiNURK/tA6nAxyYd5oeLZQUd2zQJ4w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.36"; hash = "sha512-E9hCzeTTHxb8LxfTRQNcG5rXhlgsSvNDOm1c8oUjJIMG1dJkKs9x47oSQccnbhvAdoMoDUV8xKxohlFjsFPiMg=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "6.0.36"; hash = "sha512-hHNGpJc4CFbExEdy22WRxvBLmXfTeDAPi2voKp17MbQWvC+qI77Icrf3ijDhlt1//1uPexFwEDli7PlA6vnCfQ=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.36"; hash = "sha512-YKC7Jv9kh1dVCQkIGfEX4ZVk/DC+6l/X5dtWP2EFDaIJsjVZm9g+BZxL2YuD9rpuKFHevJDqliDtAq95SQxE7A=="; }) @@ -155,6 +158,7 @@ let (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.36"; hash = "sha512-nuzHFGpbwv2owK6F/uJuj0m70BAG1NAj+ANbHyt7VKCktSI1bXLi/Fn6/7xiB7scXLcdMC6ay5cZrAlC6kSUDQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.36"; hash = "sha512-6myLyhUePahDenH3ew+QXNkBjBWjIs5vKI34OqGlE6Yqg+MiG9G6WkC/UnNX539C/ymgDapWqmucLUq4zUX2HA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.36"; hash = "sha512-05QcCR4RZ4ntU+Epf8Pj+6Jk0hPYtOwsw7YE0pn1TsGKA9F2eodaXyhh8Ppyq8nrnI6DqxIiNrVJX+JFPhTfZQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "6.0.36"; hash = "sha512-Nvb3OtaLQQaWMr55G9bMnKUFDBqTJSiBv/4iiVBoErAzFQNgV9azkmji4Id30099/vQH+wUS4XvyXWSxWmS7xQ=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 3ab08496f8ae9..cfb0ac1831fc2 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -11,6 +11,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha512-puv59sewO3+HudFk/Fpt8x3IJuEDk5TvTSJdn/EM00P8j5AmA3WyjHA1bSSUOuyGwjxPDe9t5iYoaYDysa97mw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha512-7xdJGNmwiuEV8vRizwuX34ETFRuxNZZk4t+o8JmGrGDecZ1JNgzip8CUz44/AYaLztUdXv3O7xZB7OQO8AO5Kg=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha512-4WZbJ4WKpN7BzXKIQhzNz3Srp3zhDHiv98SFGQlAzFiYp+viQ6nzD4jzax9yOkx6mDCuOsJfscEq2U/pXL+2dw=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "7.0.20"; hash = "sha512-eCdVf6ia9vPelz62o84/e7D/fIFeBjQ/iEOU9aa/1PYcR0yKuW8J/+6oJ996MrZfnrdS8ml/2cWEwAeJeosydw=="; }) ]; hostPackages = { @@ -143,6 +144,7 @@ let (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha512-MuLMyS3eKS2ajo5L971Lfd2vwq7X/oFd8gAZFvPCyHGBkvCwsgJacNhujz+vIdgq3nSVqTullR03BSRPGZNddg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha512-Di92c6M5r+E9UYkOhKsdPYV+w/QjmTrdS4CIooRlsSjfm3h75AsS5+0nApBnct/GJYQ4t9ZVVnbP+njoyhTXeA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha512-Qds42bScEWkFo+bHjyFG1PcsU8/n0phSa4LMAQBMT2CTs1/kW2o5uvPdQvnwIJ2m2qNY6vL7J/W/oePh6hGmFw=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha512-9/XYKLU2xVEkWQBWp7HcpbjIDJ6dU1cPGA2EN6ZHBF7eUbinWDOYT+H+8nFcTKtvudtir7ouU72UiP6Do6lkKw=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha512-H9YZkbflMTqW04B9XpumTZwyNaFgtNnBxCTzM93XYNFPZbE6nbhuCUz7c2bdF9M3cZJzbm/4ITWFqBLoTMrqbg=="; }) @@ -153,6 +155,7 @@ let (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha512-yiA3VeELW4zI+7yetMzUWkTiW+pb1nLjJY3hEZXDpVBxSgHcxdkvS4pWnBK97tS9Hujt6tfQOqDbWIj1XfBEfw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha512-Q0NF8q0UKGD3V+95GvErCff7jyJPuyk8/EO3T72PNCfPr2AIGPZtqCuDYTt4xnLyXoYUxyKEqALn2mmVvO+t0w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; hash = "sha512-BLtlpQCuwfaoMmOYG1VUb16L1DX+ZrKFpJ5eQ0MW36MqrzR8Id9nkyZ161xneeyhxBUfi/m5zXfP20AFQQ1uXg=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha512-Q0TcTdqzKzsZ3vdclO5OAEwBzLmdAwfupwIFNYY0amyS1oBwkMYJ/qLEZArMtzcVR0FxZw0jKdn0bW+ADvKIeA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha512-s9lK1tQca5Qb4aZjEBPSGHZhDSksvfp/aj3xv8q39UqBKGtWdIAdrtcgq8qgM5nWavaCiWWW+CAEgmzFRIRpOw=="; }) @@ -163,6 +166,7 @@ let (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha512-1ly66dLhrDCgk8BiO/rxDRwUT+DbOXH3kIwnO+TiMJfID+dyqfpw3ZIbeHbIxW1A5Ukexh3mcv6ndMTkbnZgog=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha512-DrzZfs6NkL7Kqnnq3HTcl8oGnvfu6oYPKVoAgA4eXdrEIWuiDIalaD/c7lSfg13ei53tzACUTlKSy1dHGErXiA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; hash = "sha512-GLCsBKRie1giQ6YrjELcvSmdEG1eeKFKn5YweCEm0e67DSZuqtJX2RxIojRV+TUvWObRPhZMM708CZ258qMr9g=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha512-bSrhO6fMuMWnjDFgOsQFgJ+j0mT6+nbHtFENNpjxsPCcUPEffR+afmt3kVhAcJdvO5u9p/nVQcAPukNq5VAavA=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index 39f5f8e436535..8f684d198beb8 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -12,6 +12,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.11"; hash = "sha512-mOgsZb1/yibFbb4nwVCvPk7KCa7S671zqjKdQGvwBxwr2vF20SW4Yw9me7bo9XMXHgR+25GlMnf3nKXkO/jgaw=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.11"; hash = "sha512-MrWOJYbQCVUn4yAcAfRBekLNhAs/UPNlPOUCXq/HwTX0wLqT4Rcgg5MIlzA6w3QIGmLWHMh60QOmEFdUXjwghw=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.11"; hash = "sha512-BDUnx2LSv8CWK3WAbPnNWt7deVdLBn4VZ5ZNUSRg4WN/Wi1x+M4WQgd2yrW+qnSSR5ll9AKhWNUsiGVWf+OsaQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "8.0.11"; hash = "sha512-lDjPBpLBE7v8HP8GzOvAI9VceGfKghbssPuIuzFuJiU+OZtYAY2JbAJqlkBSQ5YH6eBjcSbbLwnC/TmwyAYSpQ=="; }) ]; hostPackages = { @@ -145,6 +146,7 @@ let (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.11"; hash = "sha512-8m49BIg9HtqZLxXt9N8rT/NlcUlLTaQMPHYzs2LbHMrlAXDatTVxZHW9lF312BBWjn1zQfAJqMtyibQtfmVKrg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.11"; hash = "sha512-rCM/d2VWCY+GpW6nTlFPICc1rMyw+qM+67X7r5yJDOwGrNSqYz3xeqi7ewP+aXYmIoQV71Od+Jb86oqOB2SDXg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.11"; hash = "sha512-PfwwvgpVmN83swqQhY4feqInM34XqsVbOeiXlKJEOgmwyKUj0cjHVidiu4HYBhy6jcOKla2uK25KTYebKqTx2Q=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "8.0.11"; hash = "sha512-kLO7kbQ6GsBopfTgc2PeRB9xlb8G+19OFfop4T0Ag/4DX+k/rjuT5Hsbo4WfiOj0Lgy2DsV/N+HbIMfydPsctw=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.11"; hash = "sha512-VkSu/oOIMPemlIf5ARuFXmmndocYjub5ut3/5JXAz5sSBKrpeWciGnsUDnnshaWHP3jK4JCj3TBds7heldom3Q=="; }) @@ -155,6 +157,7 @@ let (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.11"; hash = "sha512-NOZYMy4egQP04ohvziFDIRDEm1tHyMme4SCxWKh6y3BVHZ0BoENVryLq2Ko/DqoBuMF4tDjUFPi1bcofEl7Xtg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.11"; hash = "sha512-wDwiNdA0vNfgwZgCe+a7FpbAiUENRcOoy3CUW7Y/5Kfc25qYWNONz9v2BfyBDLRYExth534ZpILww3QkPmsiaQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.11"; hash = "sha512-eEgNGyaapr2MeHDmvfJuVPMavmtS7XdBd8xSgKWF64Yuo7mXoCtcgWzagG7BGDg65mW2vyFKE1iidZ9viVNbAQ=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "8.0.11"; hash = "sha512-5G+jWSlulRZlyFmfMpecNFc92hvmr8Kv5LPlAya57WaRNT8exBk7U69b3EOaB9ukXClfyxIO2dO3G8Fsmp0Txw=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.11"; hash = "sha512-OPIUdM0ZFxcAzoVqJIy1qr4X6Tc8jQw8J1rsjrUL5iR24YGPT1kcSyC78G4S5F7kIRykjg8bnMRgLxiJ2B3THA=="; }) @@ -165,6 +168,7 @@ let (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.11"; hash = "sha512-UW/jpK2X+Wvpj/lymy/31jZBQK+Q7oTSeNUxMZxEiv/1sk740ah4kGYsxVSlQmx+D6M2T+Yn/JCYgCBEDaTfug=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.11"; hash = "sha512-Zxw2Fnc7jzpqT0M36wTYAeqJ1qZKXrStOBfjKY3OYMfGIsLd10dEwiHYcNAKbDlzmOFxU7UlZoxWcBCz1pMFag=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.11"; hash = "sha512-Kr/G3KP5rXMURU82OJ0jSTCweYg3vnCcUXk6D+SvR64JYEC0DC5x5nDnMLnbTulB4S4NRJvFClVwFUzTJyzc6g=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "8.0.11"; hash = "sha512-zD2dKS+Kci3W+e406S8mXplOgovUQFx5URDFBgAJGXwctciWO9+Y2dkNcYy8ettcktFrt7KhwIMO5ADyUaf2yQ=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index b8af661041b39..908aa84e6fa4f 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -9,6 +9,7 @@ let (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0"; hash = "sha512-s9us2abMLwrWpH1glRbjlMhbwCLvq6MhVBwcAjCqeD36kgBT6rx8PA9Ro8W6715QvRz9luJPJLUd1A1Im5QjAA=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0"; hash = "sha512-VlXpaCL4/ZBq1vlW/58bwm9hNd2MXRiwPXhvfclsLMJ2j6fJaaX2AmB3XsgIWYlageW0FY1v+QmyhrIfmKJGxg=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0"; hash = "sha512-xg196uBfnUmJlc5aizfTi588MyruI9Hlvaqj3mMbx1J9GfpF+t3gdWR6uKbH0lVW9oxzJ7FgX7NWZEZj33j0ag=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "9.0.0"; hash = "sha512-syb1sET0yJjURRX4nla506UzGVtVttxKn1vOxlvygCPui0fiF7i34r1u0sl3B4k9Z6Yog93E9GWZOIq2OnCtKA=="; }) ]; hostPackages = { @@ -109,18 +110,21 @@ let (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0"; hash = "sha512-2MkdFDpDUQFBNJsytmLbyv51Jeyl7vG4NoO1ekWAhNa+ZzwVOtgl3VJNlHgsgwGqyYc8VPmbT5ZAFrBNSR3hoQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0"; hash = "sha512-mEW0ITYKnBCRuXQDvFkasb4FaeV1GHobQGb6r/DRZED/u4b7qK9QMA8jDr29LzHdfGlZJL7dsBVyUfjOAvhuxQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0"; hash = "sha512-w5DtpHfp82nsMcSM9lyOCEj7pxohn4b8/m4MShhA87WigKB6tVdA9j6xnjC6eX16OvKkhbQ4xJhVfzt3G1d4ng=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-arm64"; version = "9.0.0"; hash = "sha512-bJcj+A9snPbI2Em76N9K7+B5zdphEUA0s77x+EbEvdeEuACVV6c5w+Roiq5OYxf0WQ47uRcUQzepTXBXcPc8Ug=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0"; hash = "sha512-BSXo3XZLsboJN72at4TMCxsZL5vjW5p3dMVtqedpXkmovGakcW0loYY22aCt40JC18i6QbsqzII+/jtTFqRoJg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0"; hash = "sha512-7SEHvvDPaYhWyNhUAurZou1oPrTgibn2k9RBW+falSlmXPq5AIqNi4EODJUbydc1QyyD2vQjRVgXvhF6aJ9s1Q=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0"; hash = "sha512-ugVn1CngjzNdGzUNJjzukCwrV9MDZ7DhwIQJMHjFPrF9e0SMHTx9BnY1VDqM24AByFrsyymvm1S4Vj540TpGag=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0"; hash = "sha512-ELSZhNXrn/PdJ/NBJYdDIVR3fhHY3k4y3gbRDqWwQZioJS3q9g26bvRMLC2dlXC5FhFRFuCTg4vGuK7f6JPPYw=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x64"; version = "9.0.0"; hash = "sha512-3cTYFs/jk4zasZfO+cxcpOFHMC8NG+ofh2fPfrtKLZjZqnppRpPehKI5Mv5Fr2a4g5SJFC0pWUpj0rba8EjRpw=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0"; hash = "sha512-eG/2FruILBj/2d1Viu/9gbYuwXIHGL61UKvvRCUGWIgS72E8LQgqSntuGO83LOk+aLUHVn5cXrFkb4bVTCGB7w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0"; hash = "sha512-mohCLeSgM6dCZB79u9Uz6qgnp7yLyEPszlHPPXI7R66mrot29ApMwDyVjFYNDv3eK/pcCHOroQKcH5qbnVr6pw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0"; hash = "sha512-CsjUwZKARvTkcPSQuMIQwaMnKnH40SJVS3F6LTWKSHvy3BXMAdnXAeB1DbAegKZyIaRrqjnIlBv9OJ7/G6V5Xw=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0"; hash = "sha512-PatJv/4NYdABL0jlheOf7mNhMUXgIH79pdhQz4lKFWgLnP7dmiGF102MbFwPs5X7jc1bbPAYhr5wVeLhukN7WA=="; }) + (fetchNupkg { pname = "Microsoft.WindowsDesktop.App.Runtime.win-x86"; version = "9.0.0"; hash = "sha512-8xmGRbuTzMuQr+Gd1qST686O13+30DOOPrUS4mf3B3sEwDL6JSvZSC5KF0KvyFZwYBnYcwJgYl3AwkXO/4xrzg=="; }) ]; }; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 45c10ebd3b390..6a3d5ee6c4d2e 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -73,8 +73,14 @@ stdenv.mkDerivation rec { hash = tarballHash; }; + strictDeps = true; + nativeBuildInputs = [ + # this gets copied into the tree, but we still need the sandbox profile + bootstrapSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out ensureNewerSourcesForZipFilesHook jq curl.bin @@ -91,15 +97,14 @@ stdenv.mkDerivation rec { nodejs ] ++ lib.optionals isDarwin [ + xcbuild + swift getconf + sigtool ]; buildInputs = [ - # this gets copied into the tree, but we still need the sandbox profile - bootstrapSdk - # the propagated build inputs in llvm.dev break swift compilation - llvm.out zlib _icu openssl @@ -111,14 +116,11 @@ stdenv.mkDerivation rec { ++ lib.optionals isDarwin ( with apple_sdk.frameworks; [ - xcbuild - swift (krb5.overrideAttrs (old: { # the propagated build inputs break swift compilation buildInputs = old.buildInputs ++ old.propagatedBuildInputs; propagatedBuildInputs = [ ]; })) - sigtool Foundation CoreFoundation CryptoKit diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 3e492491afd7a..705273772262f 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -38,6 +38,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile; + strictDeps = true; + propagatedBuildInputs = lib.optional (type == "sdk") nugetPackageHook; nativeBuildInputs = [ installShellFiles ]; @@ -46,8 +48,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p "$out"/bin "$out"/share/dotnet + mkdir -p "$out"/bin "$out"/share ln -s "$src"/bin/* "$out"/bin + ln -s "$src"/share/dotnet "$out"/share runHook postInstall ''; @@ -81,6 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { template, usePackageSource ? false, build, + nativeBuildInputs ? [ ], buildInputs ? [ ], runtime ? finalAttrs.finalPackage.runtime, runInputs ? [ ], @@ -91,7 +95,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { sdk = finalAttrs.finalPackage; built = stdenv.mkDerivation { name = "dotnet-test-${name}"; - buildInputs = [ sdk ] ++ buildInputs ++ lib.optional (usePackageSource) sdk.packages; + strictDeps = true; + nativeBuildInputs = [ sdk ] ++ nativeBuildInputs; + buildInputs = buildInputs ++ lib.optional (usePackageSource) sdk.packages; # make sure ICU works in a sandbox propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; unpackPhase = '' @@ -125,8 +131,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ) ( lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime.unwrapped}/share/dotnet + export DOTNET_ROOT=${runtime}/share/dotnet '' + run ); @@ -224,11 +229,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; template = "console"; usePackageSource = true; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin swiftPackages.swift; buildInputs = [ zlib ] - ++ lib.optional stdenv.hostPlatform.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin; with apple_sdk.frameworks; [ 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 index 9ad8c3b335f60..c5b1da7f57c88 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -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 = [ diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix index 2fedc633b176d..6aa3d3bab590f 100644 --- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -21,7 +21,7 @@ let removeReferencesTo ]; postFixup = (oldAttrs.postFixup or "") + '' - remove-references-to -t ${dotnet-runtime.unwrapped} "$out/bin/Application" + remove-references-to -t ${dotnet-runtime} "$out/bin/Application" ''; }); @@ -46,7 +46,7 @@ in use-dotnet-root-env = testers.testEqualContents { assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper"; expected = runtimeVersionFile; - actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime.unwrapped}/share/dotnet"; } '' + actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime}/share/dotnet"; } '' ${appWithoutFallback}/bin/Application >"$out" ''; };