travis: Separate job for Haskell on Linux + bump nix version

.travis.yml

@@ -2,44 +2,52 @@ jobs:
   include:
   - os: linux
     language: nix
-    nix: 2.1.3
-    env: STACK_YAML=pkg/hs/stack.yaml
+    nix: 2.3.6
     before_install:
       - git lfs pull
-      - sh/travis-install-stack
-
     install:
       - nix-env -iA cachix -f https://cachix.org/api/v1/install
-      - stack --no-terminal --install-ghc build urbit-king --only-dependencies
-
     script:
       - cachix use urbit2
       - ./sh/cachix
       - make build
       - make release
-      - sh/release-king-linux64-dynamic
       - sh/ci-tests
 
-  - os: osx
+  - os: linux
     language: generic
-    sudo: required
     env: STACK_YAML=pkg/hs/stack.yaml
-
-    before_install:
-      - sh/travis-install-stack
-
-    install:
-      - stack --no-terminal --install-ghc build urbit-king --only-dependencies
-
-    script:
-      - sh/release-king-darwin-dynamic
-
     cache:
       directories:
       - $HOME/.ghc
       - $HOME/.cabal
       - $HOME/.stack
       - $TRAVIS_BUILD_DIR/.stack-work
+    before_install:
+      - sh/travis-install-stack
+    install:
+      - stack --no-terminal --install-ghc build urbit-king --only-dependencies
+    script:
+      - stack test
+      - sh/release-king-linux64-dynamic
+
+  - os: osx
+    language: generic
+    sudo: required
+    env: STACK_YAML=pkg/hs/stack.yaml
+    cache:
+      directories:
+      - $HOME/.ghc
+      - $HOME/.cabal
+      - $HOME/.stack
+      - $TRAVIS_BUILD_DIR/.stack-work
+    before_install:
+      - sh/travis-install-stack
+    install:
+      - stack --no-terminal --install-ghc build urbit-king --only-dependencies
+    script:
+      - stack test
+      - sh/release-king-darwin-dynamic
 
 deploy:
   - skip_cleanup: true

sh/ci-tests

@@ -2,10 +2,6 @@
 
 set -ex
 
-export STACK_YAML="`pwd`/pkg/hs/stack.yaml"
-
-stack test urbit-king
-
 if [ "$TRAVIS_PULL_REQUEST" = false ]
 then
 

sh/test

@@ -2,8 +2,6 @@
 
 set -e
 
-stack test urbit-king --fast
-
 pkg=$(nix-build nix/ops -A test --no-out-link "$@")
 
 hdr () {