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

[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/5c14884e961ee96fa6d0b435031b1e50a1d6239c/ghc

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

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

    circleci: Reenable FreeBSD


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

5c14884e961ee96fa6d0b435031b1e50a1d6239c
 .circleci/config.yml        | 3 +--
 .circleci/prepare-system.sh | 2 +-
 2 files changed, 2 insertions(+), 3 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..34ad870 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -27,7 +27,7 @@ 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