diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index dc3564f6003..0740802ca4a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -20,6 +20,8 @@ rec { sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh ##### + # v3.1 (lts) aspnetcore_3_1 = buildAspNetCore { icu = icu70; diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index 966f0a9c061..162f1af70ec 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -84,6 +84,11 @@ Examples: aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")" runtime_files="$(release_files "$release_content" "runtime")" sdk_files="$(release_files "$release_content" "sdk")" + if [ $major_minor = "3.1" ]; then + icu_attr="icu = icu70;" + else + icu_attr="inherit icu;" + fi major_minor_underscore=${major_minor/./_} channel_version=$(jq -r '."channel-version"' <<< "$content") @@ -91,16 +96,19 @@ Examples: echo " # v$channel_version ($support_phase) aspnetcore_$major_minor_underscore = buildAspNetCore { + $icu_attr version = \"${aspnetcore_version}\"; $(platform_sources "$aspnetcore_files") }; runtime_$major_minor_underscore = buildNetRuntime { + $icu_attr version = \"${runtime_version}\"; $(platform_sources "$runtime_files") }; sdk_$major_minor_underscore = buildNetSdk { + $icu_attr version = \"${sdk_version}\"; $(platform_sources "$sdk_files") }; "