From d329b50e423ee582f1ca979a143b1df7e19f5b9a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 11 Nov 2017 10:28:53 +0100
Subject: Update env

---
 .gitlab-ci.yml | 8 +++++++-
 Makefile       | 2 +-
 shell.nix      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24abfc0..9677cd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,14 @@
 image: haskell:latest
 
+variables:
+  STACK_ROOT: "${CI_PROJECT_DIR}/.stack"
+  STACK_OPTS: "--system-ghc"
+
 cache:
   paths:
+  - .stack
   - .stack-work
+  - target
   - output
   - node_modules
   - bower_components
@@ -12,7 +18,7 @@ pages:
   script:
     - apt-get update
     - apt-get install -y curl
-    - curl -sL https://deb.nodesource.com/setup_7.x | bash
+    - curl -sL https://deb.nodesource.com/setup_8.x | bash
     - apt-get install -y xz-utils make nodejs
     - npm install bower
     - npm install purescript
diff --git a/Makefile b/Makefile
index 837803c..c823259 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: build
 
 start:
-	@nix-shell --command "mux local"
+	@nix-shell --command "tmuxinator local"
 
 stop:
 	@tmux kill-session -t cooking
diff --git a/shell.nix b/shell.nix
index 4d32712..7f7f3bd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,7 +9,7 @@ with import <nixpkgs> {}; {
       yarn
       tmux
       tmuxinator
-      nodejs-7_x
+      nodejs-8_x
     ];
     shellHook = ''
       export PATH=node_modules/.bin:$PATH;
-- 
cgit v1.2.3