[commit: ghc] wip/enable-freebsd-ci: circleci: Reenable FreeBSD (f8360a0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/enable-freebsd-ci
Link       : http://ghc.haskell.org/trac/ghc/changeset/f8360a0db06246e189431e45487a429f82f7c1bb/ghc

>---------------------------------------------------------------

commit f8360a0db06246e189431e45487a429f82f7c1bb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Jul 24 11:43:06 2018 -0400

    circleci: Reenable FreeBSD


>---------------------------------------------------------------

f8360a0db06246e189431e45487a429f82f7c1bb
 .circleci/config.yml        | 3 +--
 .circleci/prepare-system.sh | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 298162e..f7cc5a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -285,8 +285,7 @@ workflows:
     jobs:
     - validate-x86_64-linux:
         *trigger_on_tags
-    # FreeBSD disabled: https://github.com/haskell/unix/issues/102
-    # - validate-x86_64-freebsd
+    - validate-x86_64-freebsd
     - validate-x86_64-darwin:
         *trigger_on_tags
     - validate-x86_64-linux-llvm
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index df0da01..c8ae019 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -9,7 +9,6 @@ fail() {
 
 echo 'BUILD_SPHINX_HTML = NO' > mk/validate.mk
 echo 'BUILD_SPHINX_PDF = NO' >> mk/validate.mk
-hackage_index_state="@1522046735"
 
 cat > mk/build.mk <<EOF
 V=1
@@ -27,11 +26,11 @@ case "$(uname)" in
         # cross-compiling to FreeBSD
         add-apt-repository -y ppa:hvr/ghc
         apt-get update -qq
-        apt-get install -qy ghc-8.0.2 cabal-install-1.24 alex happy \
+        apt-get install -qy ghc-8.0.2 cabal-install alex happy \
                             ncurses-dev git make automake autoconf gcc perl \
                             python3 texinfo xz-utils lbzip2 patch
         cabal update
-        cabal install --reinstall hscolour --index-state=$hackage_index_state
+        cabal install --reinstall hscolour
         ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
 
         echo 'HADDOCK_DOCS = NO' >> mk/build.mk