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

dotnet: add passthru.runtime/aspnetcore to sdk packages

Browse Source
This commit is contained in:
David McFarland 2024-10-28 23:34:35 -03:00
parent 6e919bf975
commit 112a4c48c6
11 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View File

@ -9,8 +9,10 @@
dotnetCorePackages,
cacert,
addNuGetDeps,
dotnet-sdk,
}:
let
default-sdk = dotnet-sdk;
transformArgs =
finalAttrs:
{
@ -82,9 +84,9 @@ let
# Whether to explicitly enable UseAppHost when building. This is redundant if useDotnetFromEnv is enabled
useAppHost ? true,
# The dotnet SDK to use.
dotnet-sdk ? dotnetCorePackages.sdk_6_0,
dotnet-sdk ? default-sdk,
# The dotnet runtime to use.
dotnet-runtime ? dotnetCorePackages.runtime_6_0,
dotnet-runtime ? dotnet-sdk.runtime,
...
}@args:
let

2
pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
View File

@ -284,6 +284,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_8_0;
aspnetcore = aspnetcore_8_0;
};
sdk = sdk_8_0;

2
pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
View File

@ -240,6 +240,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_9_0;
aspnetcore = aspnetcore_9_0;
};
sdk = sdk_9_0;

10
pkgs/development/compilers/dotnet/build-dotnet.nix
View File

@ -5,6 +5,8 @@
commonPackages ? null,
hostPackages ? null,
targetPackages ? null,
runtime ? null,
aspnetcore ? null,
}:
assert builtins.elem type [
@ -14,7 +16,11 @@ assert builtins.elem type [
];
assert
if type == "sdk" then
commonPackages != null && hostPackages != null && targetPackages != null
commonPackages != null
&& hostPackages != null
&& targetPackages != null
&& runtime != null
&& aspnetcore != null
else
true;
@ -190,7 +196,7 @@ mkWrapper type (
}
// lib.optionalAttrs (type == "sdk") {
packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid};
inherit targetPackages;
inherit targetPackages runtime aspnetcore;
updateScript =
let

7
pkgs/development/compilers/dotnet/packages.nix
View File

@ -156,7 +156,12 @@ let
passthru = {
inherit (vmr) icu targetRid hasILCompiler;
inherit packages targetPackages;
inherit
packages
targetPackages
runtime
aspnetcore
;
};
meta = vmr.meta // {

2
pkgs/development/compilers/dotnet/update.sh
View File

@ -348,6 +348,8 @@ in rec {
version = \"${sdk_version}\";
$sdk_sources
inherit commonPackages hostPackages targetPackages;
runtime = runtime_$major_minor_underscore;
aspnetcore = aspnetcore_$major_minor_underscore;
};"
done

4
pkgs/development/compilers/dotnet/versions/6.0.nix
View File

@ -274,6 +274,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_6_0;
aspnetcore = aspnetcore_6_0;
};
sdk_6_0_1xx = buildNetSdk {
@ -313,6 +315,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_6_0;
aspnetcore = aspnetcore_6_0;
};
sdk_6_0 = sdk_6_0_4xx;

6
pkgs/development/compilers/dotnet/versions/7.0.nix
View File

@ -282,6 +282,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_7_0;
aspnetcore = aspnetcore_7_0;
};
sdk_7_0_3xx = buildNetSdk {
@ -321,6 +323,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_7_0;
aspnetcore = aspnetcore_7_0;
};
sdk_7_0_1xx = buildNetSdk {
@ -360,6 +364,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_7_0;
aspnetcore = aspnetcore_7_0;
};
sdk_7_0 = sdk_7_0_4xx;

6
pkgs/development/compilers/dotnet/versions/8.0.nix
View File

@ -284,6 +284,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_8_0;
aspnetcore = aspnetcore_8_0;
};
sdk_8_0_3xx = buildNetSdk {
@ -323,6 +325,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_8_0;
aspnetcore = aspnetcore_8_0;
};
sdk_8_0_1xx = buildNetSdk {
@ -362,6 +366,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_8_0;
aspnetcore = aspnetcore_8_0;
};
sdk_8_0 = sdk_8_0_4xx;

2
pkgs/development/compilers/dotnet/versions/9.0.nix
View File

@ -240,6 +240,8 @@ in rec {
};
};
inherit commonPackages hostPackages targetPackages;
runtime = runtime_9_0;
aspnetcore = aspnetcore_9_0;
};
sdk_9_0 = sdk_9_0_1xx;

4
pkgs/development/compilers/dotnet/wrapper.nix
View File

@ -82,8 +82,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
usePackageSource ? false,
build,
buildInputs ? [ ],
# TODO: use correct runtimes instead of sdk
runtime ? finalAttrs.finalPackage,
runtime ? finalAttrs.finalPackage.runtime,
runInputs ? [ ],
run ? null,
runAllowNetworking ? false,
@ -188,6 +187,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
name = "web";
template = "web";
build = "dotnet publish -o $out/bin";
runtime = finalAttrs.finalPackage.aspnetcore;
runInputs = [
expect
curl