Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

dotnetCorePackages: move systemToDotnetRid out of sdk

+17 -17
+1 -1
pkgs/applications/emulators/ryujinx/default.nix
··· 91 "/p:ExtraDefineConstants=DISABLE_UPDATER" 92 ]; 93 94 - dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_7_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 95 96 executables = [ 97 "Ryujinx.Headless.SDL2"
··· 91 "/p:ExtraDefineConstants=DISABLE_UPDATER" 92 ]; 93 94 + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 95 96 executables = [ 97 "Ryujinx.Headless.SDL2"
+1 -1
pkgs/applications/misc/ArchiSteamFarm/default.nix
··· 26 nugetDeps = ./deps.nix; 27 28 # Without this dotnet attempts to restore for Windows targets, which it cannot find the dependencies for 29 - dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 30 31 projectFile = "ArchiSteamFarm.sln"; 32 executables = [ "ArchiSteamFarm" ];
··· 26 nugetDeps = ./deps.nix; 27 28 # Without this dotnet attempts to restore for Windows targets, which it cannot find the dependencies for 29 + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 30 31 projectFile = "ArchiSteamFarm.sln"; 32 executables = [ "ArchiSteamFarm" ];
+1 -3
pkgs/build-support/dotnet/build-dotnet-module/default.nix
··· 2 , stdenvNoCC 3 , callPackage 4 , writeShellScript 5 - , writeText 6 , srcOnly 7 , linkFarmFromDrvs 8 , symlinkJoin 9 , makeWrapper 10 , dotnetCorePackages 11 - , dotnetPackages 12 , mkNugetSource 13 , mkNugetDeps 14 , nuget-to-nix ··· 167 in 168 builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags); 169 170 - runtimeIds = map (system: dotnet-sdk.systemToDotnetRid system) platforms; 171 in 172 writeShellScript "fetch-${pname}-deps" '' 173 set -euo pipefail
··· 2 , stdenvNoCC 3 , callPackage 4 , writeShellScript 5 , srcOnly 6 , linkFarmFromDrvs 7 , symlinkJoin 8 , makeWrapper 9 , dotnetCorePackages 10 , mkNugetSource 11 , mkNugetDeps 12 , nuget-to-nix ··· 165 in 166 builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags); 167 168 + runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) platforms; 169 in 170 writeShellScript "fetch-${pname}-deps" '' 171 set -euo pipefail
-10
pkgs/development/compilers/dotnet/build-dotnet.nix
··· 122 passthru = rec { 123 inherit icu packages; 124 125 - runtimeIdentifierMap = { 126 - "x86_64-linux" = "linux-x64"; 127 - "aarch64-linux" = "linux-arm64"; 128 - "x86_64-darwin" = "osx-x64"; 129 - "aarch64-darwin" = "osx-arm64"; 130 - }; 131 - 132 updateScript = 133 if type == "sdk" then 134 let ··· 140 pushd pkgs/development/compilers/dotnet 141 exec ${./update.sh} "${majorVersion}" 142 '' else null; 143 - 144 - # Convert a "stdenv.hostPlatform.system" to a dotnet RID 145 - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); 146 147 tests = { 148 version = testers.testVersion {
··· 122 passthru = rec { 123 inherit icu packages; 124 125 updateScript = 126 if type == "sdk" then 127 let ··· 133 pushd pkgs/development/compilers/dotnet 134 exec ${./update.sh} "${majorVersion}" 135 '' else null; 136 137 tests = { 138 version = testers.testVersion {
+12
pkgs/development/compilers/dotnet/default.nix
··· 14 buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); 15 }; 16 17 ## Files in versions/ are generated automatically by update.sh ## 18 dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); 19 dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); ··· 21 dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); 22 in 23 rec { 24 combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; 25 26 # EOL
··· 14 buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); 15 }; 16 17 + runtimeIdentifierMap = { 18 + "x86_64-linux" = "linux-x64"; 19 + "aarch64-linux" = "linux-arm64"; 20 + "x86_64-darwin" = "osx-x64"; 21 + "aarch64-darwin" = "osx-arm64"; 22 + }; 23 + 24 + # Convert a "stdenv.hostPlatform.system" to a dotnet RID 25 + systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); 26 + 27 ## Files in versions/ are generated automatically by update.sh ## 28 dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); 29 dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); ··· 31 dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); 32 in 33 rec { 34 + inherit systemToDotnetRid; 35 + 36 combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; 37 38 # EOL
+1 -1
pkgs/development/dotnet-modules/python-language-server/default.nix
··· 26 dotnet-sdk = dotnetCorePackages.sdk_3_1; 27 dotnet-runtime = dotnetCorePackages.runtime_3_1; 28 29 - dotnetRestoreFlags = [ "--runtime ${dotnet-sdk.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 30 31 nativeBuildInputs = [ autoPatchelfHook ]; 32 buildInputs = [ stdenv.cc.cc.lib ];
··· 26 dotnet-sdk = dotnetCorePackages.sdk_3_1; 27 dotnet-runtime = dotnetCorePackages.runtime_3_1; 28 29 + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; 30 31 nativeBuildInputs = [ autoPatchelfHook ]; 32 buildInputs = [ stdenv.cc.cc.lib ];
+1 -1
pkgs/games/BeatSaberModManager/default.nix
··· 34 patches = [ 35 (substituteAll { 36 src = ./add-runtime-identifier.patch; 37 - runtimeIdentifier = dotnet-sdk.passthru.systemToDotnetRid targetPlatform.system; 38 }) 39 ]; 40
··· 34 patches = [ 35 (substituteAll { 36 src = ./add-runtime-identifier.patch; 37 + runtimeIdentifier = dotnetCorePackages.systemToDotnetRid targetPlatform.system; 38 }) 39 ]; 40