From 87a9b3b26e0b8e690729c220d9fa1ca4103bd8a5 Mon Sep 17 00:00:00 2001
From: Matvey Aksenov <matvey.aksenov@gmail.com>
Date: Thu, 23 Feb 2017 20:38:20 +0000
Subject: [PATCH] travis please

---
 .travis.yml |  4 ++--
 LICENSE     |  2 +-
 default.nix |  2 +-
 shell.nix   | 20 +++++++++++++-------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 946ab60..2e629f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ sudo: false
 
 matrix:
   include:
-    - env: CABALVER=1.16 GHCVER=7.6.3 RUN_TESTS=
+    - 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 RUN_TESTS=
+    - 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 RUN_TESTS=--run-tests
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
diff --git a/LICENSE b/LICENSE
index 66c1ad9..cc5e709 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015, Matvey Aksenov
+Copyright (c) 2015-2017, Matvey Aksenov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/default.nix b/default.nix
index 265274c..29d63d1 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }: let
   ghc = nixpkgs.pkgs.haskell.packages.${compiler};
   npm = import ./npm {};
 in
diff --git a/shell.nix b/shell.nix
index 07ba1a0..e0f7b8f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,17 +1,23 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }: let
   inherit (nixpkgs) pkgs;
-  ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages(ps: [
+  haskell = pkgs.haskell.packages.${compiler};
+
+  ghc = haskell.ghcWithPackages(ps: [
     ps.hdevtools ps.doctest ps.hspec-discover ps.hlint ps.ghc-mod
   ]);
-  cabal-install = pkgs.haskell.packages.${compiler}.cabal-install;
-  pkg = import ./default.nix { inherit nixpkgs compiler; };
   npm = import ./npm {};
+
+  this = import ./default.nix { inherit nixpkgs compiler; };
 in
   pkgs.stdenv.mkDerivation rec {
-    name = pkg.pname;
-    buildInputs = [ ghc cabal-install npm.nodePackages.ldapjs ] ++ pkg.env.buildInputs;
+    name = this.pname;
+    buildInputs = [
+      ghc
+      haskell.cabal-install
+      npm.nodePackages.ldapjs
+    ] ++ this.env.buildInputs;
     shellHook = ''
-      ${pkg.env.shellHook}
+      ${this.env.shellHook}
       cabal configure --enable-tests --package-db=$NIX_GHC_LIBDIR/package.conf.d
     '';
   }