Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-cc

This commit is contained in:
John Ericson
2019-11-25 00:23:07 +00:00
5828 changed files with 170193 additions and 135852 deletions
@@ -134,8 +134,6 @@ stdenv.mkDerivation {
installPhase =
''
set -u
mkdir -p $out/bin $out/nix-support
wrap() {
@@ -224,8 +222,6 @@ stdenv.mkDerivation {
postFixup =
''
set -u
# Backwards compatability for packages expecting this file, e.g. with
# `$NIX_CC/nix-support/dynamic-linker`.
#