Merge branch 'master' into staging

2018-05-20 13:20:53 +02:00
parent 90c0100139 68cdc9c09e
commit 392e6de7d0
82 changed files with 5170 additions and 2247 deletions
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
    # Some scripts used during the build need to have their shebangs patched
    ''
      patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
    '' +

    # Strip is harmful, see also below. It's important that this happens