From f60e9e5f4d21da171649afc178d523f175d8cb85 Mon Sep 17 00:00:00 2001
From: Matvey Aksenov <matvey.aksenov@gmail.com>
Date: Sat, 27 Aug 2016 14:20:51 +0000
Subject: [PATCH] Add GHC 8.0 to the test matrix.

---
 .travis.yml             | 54 ++++++++++++++++++++---------------------
 default.nix             |  2 +-
 npm/default.nix         |  2 +-
 npm/nodeLib/default.nix |  2 +-
 shell.nix               |  2 +-
 5 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33e95a2..c1b146e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,33 @@
-env:
-  - CABALVER=1.18 GHCVER=7.6.3
-  - CABALVER=1.18 GHCVER=7.8.4
-  - CABALVER=1.22 GHCVER=7.10.1
+language: c
+
+sudo: false
+
+matrix:
+  include:
+    - env: CABALVER=1.16 GHCVER=7.6.3
+      addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
+    - env: CABALVER=1.18 GHCVER=7.8.4
+      addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+    - env: CABALVER=1.22 GHCVER=7.10.3
+      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.0.1
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],sources: [hvr-ghc]}}
+    - env: CABALVER=head GHCVER=head
+      addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
+
+  allow_failures:
+    - env: CABALVER=1.16 GHCVER=7.6.3 # weird spec problems
+    - env: CABALVER=1.18 GHCVER=7.8.4 # weird spec problems
+    - env: CABALVER=head GHCVER=head
 
 before_install:
-  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
-  - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER npm
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+  - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
-  - cabal --version
-  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
-  - travis_retry cabal update
-  - cabal install --only-dependencies --enable-tests --enable-benchmarks
+  - cabal update
+  - cabal install --only-dependencies --enable-tests ldap-client.cabal
   - npm install ldapjs
 
 script:
-  - cabal configure --enable-tests -v2
-  - cabal build
-  - cabal test
-  - |
-    if [ $GHCVER = "7.10.1" ]; then
-      cabal check
-    fi
-  - cabal sdist
-  - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
-    cd dist/;
-    if [ -f "$SRC_TGZ" ]; then
-      cabal install --force-reinstalls "$SRC_TGZ";
-    else
-    echo "expected '$SRC_TGZ' not found";
-      exit 1;
-    fi
+  - cabal install --enable-tests ldap-client.cabal
+  - cabal sdist && cabal install --enable-tests dist/ldap-client-*.tar.gz
diff --git a/default.nix b/default.nix
index 3656fcf..265274c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: let
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let
   ghc = nixpkgs.pkgs.haskell.packages.${compiler};
   npm = import ./npm {};
 in
diff --git a/npm/default.nix b/npm/default.nix
index 71c6258..2325014 100644
--- a/npm/default.nix
+++ b/npm/default.nix
@@ -6,4 +6,4 @@ let
     };
     in nodeLib.generatePackages {
       rootPath = ./nodePackages;
-    }
\ No newline at end of file
+    }
diff --git a/npm/nodeLib/default.nix b/npm/nodeLib/default.nix
index 2cb1eb5..c6e94c9 100644
--- a/npm/nodeLib/default.nix
+++ b/npm/nodeLib/default.nix
@@ -75,7 +75,7 @@ let
 in
 
 rec {
-  nodejs = pkgs."nodejs-${replaceDots "_" nodejsVersion}" or (
+  nodejs = pkgs.nodejs or (
     throw "The given nodejs version ${nodejsVersion} has not been defined."
   );
   buildNodePackage = import ./buildNodePackage.nix ({
diff --git a/shell.nix b/shell.nix
index 29656cc..07ba1a0 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: let
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let
   inherit (nixpkgs) pkgs;
   ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages(ps: [
     ps.hdevtools ps.doctest ps.hspec-discover ps.hlint ps.ghc-mod