Merge remote-tracking branch 'origin/stable'

Author: borsboom

doc/maintainers/ghc.md

@@ -17,7 +17,6 @@
         * FreeBSD bindists are mirrored from http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists
         * musl bindists are mirrored from https://github.com/redneb/ghc-alt-libc/releases
 
-
   * Download all the relevant GHC bindists from their sources, and upload them to the just-created Github release (see
     [stack-setup-2.yaml](https://github.com/fpco/stackage-content/blob/master/stack/stack-setup-2.yaml)
     for the ones we used in the last GHC release).
@@ -40,11 +39,13 @@
 
         cd stack && ./update-global-hints.hs ghc-X.Y.Z
 
-    and commit and push the changes.
+    and commit the changes.
 
 
 ## Building GHC
 
+**NOTE: We are no longer building custom GHC bindists.  This section remains for future reference, but GHC's build system has changed substantially since it was written.**
+
 TODO: look into using https://github.com/bgamari/ghc-utils/blob/master/rel-eng/bin-release.sh, which is the script used to official bindists.
 
 On systems with a small `/tmp`, you should set TMP and TEMP to an alternate

etc/scripts/mirror-ghc-bindists-to-github.sh

@@ -20,7 +20,7 @@
 # https://downloads.haskell.org/~ghc/X.Y.Z/.
 #
 
-GHCVER=8.10.1
+GHCVER=8.10.2
 
 if [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
   echo "$0: GITHUB_AUTH_TOKEN environment variable is required" >&2
@@ -50,18 +50,6 @@ mirror_ () {
     date >"$srcfn.downloaded"
   fi
   local destfn=ghc-$GHCVER-${suffix}${destsuffix:+_}${destsuffix}.tar.${destext}
-  while [[ $# -gt 0 ]]; do
-    alias="$1"
-    echo "    $alias:" >>stack-setup-$GHCVER.yaml
-    echo "        $GHCVER:" >>stack-setup-$GHCVER.yaml
-    echo "            # Mirrored from $srcurl" >>stack-setup-$GHCVER.yaml
-    echo "            url: \"https://github.com/commercialhaskell/ghc/releases/download/ghc-$GHCVER-release/$destfn\"" >>stack-setup-$GHCVER.yaml
-    echo "            content-length: $(stat --printf="%s" "$destfn" 2>/dev/null || stat -f%z "$destfn")" >>stack-setup-$GHCVER.yaml
-    echo "            sha1: $(shasum -a 1 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
-    echo "            sha256: $(shasum -a 256 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
-    echo "" >>stack-setup-$GHCVER.yaml
-    shift
-  done
   if [[ ! -s "$destfn.uploaded" ]]; then
     if [[ "${srcext}" == "xz" && "${destext}" == "bz2" ]]; then
       xzcat "$srcfn" | bzip2 -c > "$destfn"
@@ -74,6 +62,18 @@ mirror_ () {
     curl --fail -X POST --data-binary "@$destfn" -H "Content-type: application/octet-stream" -H "Authorization: token $GITHUB_AUTH_TOKEN" "$UPLOAD_URL?name=$destfn"
     date >"$destfn.uploaded"
   fi
+  while [[ $# -gt 0 ]]; do
+    alias="$1"
+    echo "    $alias:" >>stack-setup-$GHCVER.yaml
+    echo "        $GHCVER:" >>stack-setup-$GHCVER.yaml
+    echo "            # Mirrored from $srcurl" >>stack-setup-$GHCVER.yaml
+    echo "            url: \"https://github.com/commercialhaskell/ghc/releases/download/ghc-$GHCVER-release/$destfn\"" >>stack-setup-$GHCVER.yaml
+    echo "            content-length: $(stat --printf="%s" "$destfn" 2>/dev/null || stat -f%z "$destfn")" >>stack-setup-$GHCVER.yaml
+    echo "            sha1: $(shasum -a 1 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
+    echo "            sha256: $(shasum -a 256 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
+    echo "" >>stack-setup-$GHCVER.yaml
+    shift
+  done
 }
 
 mirror () {
@@ -90,9 +90,10 @@ mirror x86_64-fedora27-linux "" xz xz linux64-tinfo6
 mirror x86_64-apple-darwin "" xz bz2 macosx
 #mirror i386-unknown-mingw32 "" xz xz windows32
 mirror x86_64-unknown-mingw32 "" xz xz windows64
-#mirror x86_64-portbld-freebsd11 "" xz xz freebsd64-11
-mirror aarch64-deb9-linux "" xz xz linux-aarch64
-mirror armv7-deb9-linux "" xz xz linux-armv7
+mirror x86_64-unknown-freebsd "" xz xz freebsd64-11
+mirror aarch64-deb10-linux "" xz xz linux-aarch64
+mirror armv7-deb10-linux "" xz xz linux-armv7
+#mirror x86_64-alpine3.10-linux-integer-simple "" xz xz @@@
 
 mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl i386-unknown-linux-musl "" xz xz linux32-musl
 mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl x86_64-unknown-linux-musl "" xz xz linux64-musl