diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 4a30107bbec..67ce79ca575 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,6 +1,7 @@ { type , version , srcs +, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71 }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; @@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; , writeText , libunwind , openssl -, icu , libuuid , zlib , curl @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath ([ stdenv.cc.cc zlib - curl icu libunwind diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 87256e95b02..0740802ca4a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn Hashes and urls below are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ callPackage }: +{ callPackage, icu70, icu }: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); @@ -20,8 +20,11 @@ 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; version = "3.1.21"; srcs = { x86_64-linux = { @@ -40,6 +43,7 @@ rec { }; runtime_3_1 = buildNetRuntime { + icu = icu70; version = "3.1.21"; srcs = { x86_64-linux = { @@ -58,6 +62,7 @@ rec { }; sdk_3_1 = buildNetSdk { + icu = icu70; version = "3.1.415"; srcs = { x86_64-linux = { @@ -77,6 +82,7 @@ rec { # v5.0 (current) aspnetcore_5_0 = buildAspNetCore { + inherit icu; version = "5.0.12"; srcs = { x86_64-linux = { @@ -95,6 +101,7 @@ rec { }; runtime_5_0 = buildNetRuntime { + inherit icu; version = "5.0.12"; srcs = { x86_64-linux = { @@ -113,6 +120,7 @@ rec { }; sdk_5_0 = buildNetSdk { + inherit icu; version = "5.0.403"; srcs = { x86_64-linux = { @@ -132,6 +140,7 @@ rec { # v6.0 (lts) aspnetcore_6_0 = buildAspNetCore { + inherit icu; version = "6.0.4"; srcs = { x86_64-linux = { @@ -154,6 +163,7 @@ rec { }; runtime_6_0 = buildNetRuntime { + inherit icu; version = "6.0.4"; srcs = { x86_64-linux = { @@ -176,6 +186,7 @@ rec { }; sdk_6_0 = buildNetSdk { + inherit icu; version = "6.0.202"; srcs = { x86_64-linux = { 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") }; "