Add initial unboxed tuple patch for ghc 8.10 (#825)

* Add initial unboxed tuple patch for ghc 8.8 * ifdLevel 0 * ifdLevel 1 * ifdLevel 2 * Update unboxed tuple patch (ifdLevel 0) * ifdLevel 1 * ifdLevel 2 * ifdLevel 1 * ifdLevel 2 * ifdLevel 1 * Make sure ghc and ghc-pkg run * ifdLevel 2 * Remove show instances from unboxed tuple patch * ifdLevel 1 * ifdLevel 2 * ifdLevel 3 * Add GHC 8.10 version of the unboxed tuple patch * Fix patch * ifdLevel 2 * ifdLevel 3 * Update unboxed tuple patch * Delete old ghc 8.8 version of patch * ifdLevel 1 * ifdLevel 2 * ifdLevel 3
input-output-hk · Oct 13, 2020 · ec96755 · ec96755
1 parent 0e12a74
commit ec96755
Show file tree

Hide file tree

Showing 3 changed files with 1,543 additions and 2 deletions.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -282,11 +282,11 @@ stdenv.mkDerivation (rec {
     ${installDeps targetPrefix}
 
     # Sanity checks for https://github.com/input-output-hk/haskell.nix/issues/660
-    if [[ ! -f "$out/bin/${targetPrefix}ghc" ]]; then
+    if ! "$out/bin/${targetPrefix}ghc" --version; then
       echo "ERROR: Missing file $out/bin/${targetPrefix}ghc"
       exit 0
     fi
-    if [[ ! -f "$out/bin/${targetPrefix}ghc-pkg" ]]; then
+    if ! "$out/bin/${targetPrefix}ghc-pkg" --version; then
       echo "ERROR: Missing file $out/bin/${targetPrefix}ghc-pkg"
       exit 0
     fi

diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -137,6 +137,8 @@ in {
                 ++ fromUntil "8.10.2" "8.12"   ./patches/ghc/MR3714-backported-to-8.10.2.patch
 
                 ++ from      "8.10.1"          ./patches/ghc/ghc-acrt-iob-func.patch
+
+                ++ fromUntil "8.10.1" "8.11"   ./patches/ghc/ghc-8.10-ubxt.patch
                 ;
         in ({
             ghc844 = final.callPackage ../compiler/ghc {