From 9356779fb325cfbf54433d0b29de8da2e4b019b7 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 5 Oct 2017 16:41:27 +0200 Subject: [PATCH 1/6] Point coreclr to 2.0.0 release --- pkgs/development/compilers/coreclr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index b619bf6ce208..6d4e611a37e8 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -12,19 +12,20 @@ , lttng-ust , liburcu , libuuid +, libkrb5 , ed , debug ? false }: stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "1.0.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "1wpig71q0kh2yrq162d32x00zlwrrs1wymkgijh49cqkn4cwkh91"; + sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; }; buildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { lttng-ust liburcu libuuid + libkrb5 ed ]; @@ -73,7 +75,9 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + # set -x ./build.sh $BuildArch $BuildType + # set +x # Try to make some sensible hierarchy out of the output pushd bin/Product/Linux.$BuildArch.$BuildType From 71202f81aacd9c86b38e23af3c9eff7d100f956c Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 5 Oct 2017 23:58:38 +0200 Subject: [PATCH 2/6] Remove old patches --- pkgs/development/compilers/coreclr/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 6d4e611a37e8..ca0df6f36443 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -47,22 +47,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's - # not wrapped - # substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" - patchShebangs build.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh - - # See https://github.com/dotnet/coreclr/issues/7573#issuecomment-253081323 - ed -v ./src/pal/src/include/pal/palinternal.h << EOF - /^#undef memcpy - -1 - d - +1 - d - w - EOF ''; BuildArch = if stdenv.is64bit then "x64" else "x86"; From 856995d8cacd687f3dcf952d8f12107ca87d8155 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 6 Oct 2017 13:41:29 +0100 Subject: [PATCH 3/6] coreclr: mark as not broken --- pkgs/development/compilers/coreclr/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index ca0df6f36443..6429a51ed4dd 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - # set -x ./build.sh $BuildArch $BuildType - # set +x # Try to make some sensible hierarchy out of the output pushd bin/Product/Linux.$BuildArch.$BuildType @@ -92,6 +90,5 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ obadz ]; license = stdenv.lib.licenses.mit; - broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak. }; } From e7fc83f1a6259adc4728cb5d487b8265af42380d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 6 Oct 2017 14:52:08 +0100 Subject: [PATCH 4/6] coreclr: cleanup build --- .../development/compilers/coreclr/default.nix | 47 +++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 6429a51ed4dd..b4ea20460854 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -13,7 +13,6 @@ , liburcu , libuuid , libkrb5 -, ed , debug ? false }: @@ -43,52 +42,42 @@ stdenv.mkDerivation rec { liburcu libuuid libkrb5 - ed ]; configurePhase = '' - patchShebangs build.sh - patchShebangs src/pal/tools/gen-buildsys-clang.sh + # override to avoid cmake running + patchShebangs . ''; BuildArch = if stdenv.is64bit then "x64" else "x86"; BuildType = if debug then "Debug" else "Release"; - hardeningDisable = [ "strictoverflow" "format" ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor" - "-Wno-error=null-dereference" + hardeningDisable = [ + "strictoverflow" + "format" ]; buildPhase = '' - ./build.sh $BuildArch $BuildType - - # Try to make some sensible hierarchy out of the output - pushd bin/Product/Linux.$BuildArch.$BuildType - mkdir lib2 - mv *.so *.so.dbg lib2 - mv bin lib3 - mkdir lib4 - mv Loader lib4 - mv inc include - mv gcinfo include - mkdir bin - mkdir -p share/doc - mv sosdocsunix.txt share/doc - for f in * ; do test -f $f && mv -v $f bin; done - popd + runHook preBuild + ./build.sh $BuildArch Release + runHook postBuild ''; installPhase = '' - mkdir -p $out - cp -rv bin/Product/Linux.$BuildArch.$BuildType/* $out + runHook preInstall + mkdir -p $out/share/dotnet $out/bin + cp -r bin/Product/Linux.$BuildArch.$BuildType/* $out/share/dotnet + for cmd in coreconsole corerun createdump crossgen ilasm ildasm mcs superpmi; do + ln -s $out/share/dotnet/$cmd $out/bin/$cmd + done + runHook postInstall ''; - meta = { + meta = with stdenv.lib; { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ obadz ]; + license = licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31cc09c62f1e..19c0c5c5b9bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13177,7 +13177,9 @@ with pkgs; comic-relief = callPackage ../data/fonts/comic-relief {}; - coreclr = callPackage ../development/compilers/coreclr { }; + coreclr = callPackage ../development/compilers/coreclr { + debug = config.coreclr.debug or false; + }; corefonts = callPackage ../data/fonts/corefonts { }; From f743e5f12734e15b916c7ffda4890a7bd24ff487 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sun, 8 Oct 2017 22:22:07 +0200 Subject: [PATCH 5/6] Change coreclr package maintainer --- pkgs/development/compilers/coreclr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index b4ea20460854..77218018cd8f 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obadz ]; + maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; } From d855091fb38b6774085ff1281d1e5ee575146810 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 10 Oct 2017 00:58:11 +0200 Subject: [PATCH 6/6] Use build type parameter --- pkgs/development/compilers/coreclr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 77218018cd8f..592eaf38d87a 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch Release + ./build.sh $BuildArch $BuildType runHook postBuild '';