dotnet: fixed runtime error for dotnet 3.1 after icu update

main
gbtb 2 years ago
parent 0be721b129
commit 611be96fd9
  1. 3
      pkgs/development/compilers/dotnet/build-dotnet.nix
  2. 11
      pkgs/development/compilers/dotnet/default.nix

@ -1,6 +1,7 @@
{ type { type
, version , version
, srcs , srcs
, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71
}: }:
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
, writeText , writeText
, libunwind , libunwind
, openssl , openssl
, icu
, libuuid , libuuid
, zlib , zlib
, curl , curl
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath ([ rpath = lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.cc
zlib zlib
curl curl
icu icu
libunwind libunwind

@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn
Hashes and urls below are retrieved from: Hashes and urls below are retrieved from:
https://dotnet.microsoft.com/download/dotnet https://dotnet.microsoft.com/download/dotnet
*/ */
{ callPackage }: { callPackage, icu70, icu }:
let let
buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
@ -22,6 +22,7 @@ rec {
# v3.1 (lts) # v3.1 (lts)
aspnetcore_3_1 = buildAspNetCore { aspnetcore_3_1 = buildAspNetCore {
icu = icu70;
version = "3.1.21"; version = "3.1.21";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -40,6 +41,7 @@ rec {
}; };
runtime_3_1 = buildNetRuntime { runtime_3_1 = buildNetRuntime {
icu = icu70;
version = "3.1.21"; version = "3.1.21";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -58,6 +60,7 @@ rec {
}; };
sdk_3_1 = buildNetSdk { sdk_3_1 = buildNetSdk {
icu = icu70;
version = "3.1.415"; version = "3.1.415";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -77,6 +80,7 @@ rec {
# v5.0 (current) # v5.0 (current)
aspnetcore_5_0 = buildAspNetCore { aspnetcore_5_0 = buildAspNetCore {
inherit icu;
version = "5.0.12"; version = "5.0.12";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -95,6 +99,7 @@ rec {
}; };
runtime_5_0 = buildNetRuntime { runtime_5_0 = buildNetRuntime {
inherit icu;
version = "5.0.12"; version = "5.0.12";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -113,6 +118,7 @@ rec {
}; };
sdk_5_0 = buildNetSdk { sdk_5_0 = buildNetSdk {
inherit icu;
version = "5.0.403"; version = "5.0.403";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -132,6 +138,7 @@ rec {
# v6.0 (lts) # v6.0 (lts)
aspnetcore_6_0 = buildAspNetCore { aspnetcore_6_0 = buildAspNetCore {
inherit icu;
version = "6.0.4"; version = "6.0.4";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -154,6 +161,7 @@ rec {
}; };
runtime_6_0 = buildNetRuntime { runtime_6_0 = buildNetRuntime {
inherit icu;
version = "6.0.4"; version = "6.0.4";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {
@ -176,6 +184,7 @@ rec {
}; };
sdk_6_0 = buildNetSdk { sdk_6_0 = buildNetSdk {
inherit icu;
version = "6.0.202"; version = "6.0.202";
srcs = { srcs = {
x86_64-linux = { x86_64-linux = {

Loading…
Cancel
Save