dotnet: remove cross-target tests from broken SDKs
This commit is contained in:
@@ -197,6 +197,8 @@ mkWrapper type (
|
||||
|
||||
passthru = {
|
||||
inherit icu hasILCompiler;
|
||||
# https://github.com/dotnet/sdk/pull/53405
|
||||
hasCrossTargetBug = lib.versionAtLeast version "10";
|
||||
}
|
||||
// lib.optionalAttrs (type == "sdk") (
|
||||
let
|
||||
|
||||
@@ -58,7 +58,7 @@ mkWrapper "sdk" (
|
||||
passthru = {
|
||||
pname = "dotnet";
|
||||
version = "combined";
|
||||
inherit (cli) icu;
|
||||
inherit (cli) icu hasCrossTargetBug;
|
||||
|
||||
versions = lib.catAttrs "version" dotnetPackages;
|
||||
packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages);
|
||||
|
||||
@@ -28,6 +28,9 @@ let
|
||||
(allow mach-lookup (global-name "com.apple.SecurityServer")
|
||||
(global-name "com.apple.system.opendirectoryd.membership"))
|
||||
'';
|
||||
passthru = args.passthru or { } // {
|
||||
inherit (vmr) icu hasCrossTargetBug;
|
||||
};
|
||||
}
|
||||
)
|
||||
);
|
||||
@@ -184,7 +187,6 @@ let
|
||||
|
||||
passthru = {
|
||||
inherit (vmr)
|
||||
icu
|
||||
targetRid
|
||||
hasILCompiler
|
||||
;
|
||||
@@ -221,10 +223,6 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (vmr) icu;
|
||||
};
|
||||
|
||||
meta = vmr.meta // {
|
||||
mainProgram = "dotnet";
|
||||
};
|
||||
@@ -252,10 +250,6 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (vmr) icu;
|
||||
};
|
||||
|
||||
meta = vmr.meta // {
|
||||
mainProgram = "dotnet";
|
||||
};
|
||||
|
||||
@@ -149,6 +149,7 @@ stdenv.mkDerivation {
|
||||
./fix-aspnetcore-portable-build.patch
|
||||
./vmr-compiler-opt-v8.patch
|
||||
]
|
||||
# see passthru.hasCrossTargetBug
|
||||
++ lib.optional (
|
||||
lib.versionAtLeast version "10" && lib.versionOlder version "11"
|
||||
) ./Prefer-DOTNET_ROOT-over-directory-traversal-when-fin.patch
|
||||
@@ -515,6 +516,7 @@ stdenv.mkDerivation {
|
||||
icu = _icu;
|
||||
# ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215
|
||||
hasILCompiler = lib.versionAtLeast version "9";
|
||||
hasCrossTargetBug = false;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -44,4 +44,6 @@ let
|
||||
};
|
||||
|
||||
in
|
||||
lib.recurseIntoAttrs (lib.mapAttrs (_: mkTest) sdks)
|
||||
lib.optionalAttrs (!dotnet-sdk.hasCrossTargetBug) (
|
||||
lib.recurseIntoAttrs (lib.mapAttrs (_: mkTest) sdks)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user