From 1308786118da6c866f4d85f4d5ef67e0b2860bd4 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt
Date: Wed, 13 Jan 2021 17:06:29 +0100
Subject: Various fixes

---
 Makefile          |  4 ++--
 cards.yaml        | 14 +++++++-------
 server/stack.yaml |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 2036434..937e606 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,10 @@ docker:
 
 .PHONY: server
 server: build
-	(cd server && \
+	(cd server && stack exec env \
 	    UPLCG_HOSTNAME=$(UPLCG_HOSTNAME) \
 	    UPLCG_PORT=$(UPLCG_PORT) \
-	    stack exec uplcg-server)
+	    uplcg-server)
 
 .PHONY: stack_build
 stack_build: $(HS_SOURCES)
diff --git a/cards.yaml b/cards.yaml
index 2d5cc7b..6fb5f39 100644
--- a/cards.yaml
+++ b/cards.yaml
@@ -48,8 +48,8 @@ popl2021:
     - generic
     - covid19
     - icfp2020
-    
-  black: 
+
+  black:
     - 'My award-winning POLP paper: F-ing _'
     - 'The critical feature that LaTeX is missing is _'
     - 'The next version of Excel must include _ as a killer-feature.'
@@ -62,17 +62,17 @@ popl2021:
     - 'One should definitely become an expert in _ before starting a PhD in PL.'
     - 'How can you call yourself a "PL researcher" without any experience with _?'
     - 'It is 2021 and I still have to explain _ to people around me.'
-    - '_ is the most under-appreciated feature of _.'    
-    - 'I do not always use _, but when I do, I prefer it with _.' 
+    - '_ is the most under-appreciated feature of _.'
+    - 'I do not always use _, but when I do, I prefer it with _.'
     - '_ is the opium of the people.'
     - 'There are three kinds of lies: lies, damned lies, and _.'
-    - 'If you're not suffering, you're doing your _ wrong!'
+    - "If you're not suffering, you're doing your _ wrong!"
     - 'Using _ was the biggest disappointment since the last Game of Thrones season.'
     - 'At POPL, no one will judge you for your attraction to _.'
     - 'I will call my PhD thesis "Fifty Shades of _".'
-    - '"Harry Potter and _" is the best fan fiction I've ever read!'
+    - "'Harry Potter and _' is the best fan fiction I've ever read!"
 
-  white: 
+  white:
     - Kripke semantics
     - covfefe
     - natural deduction
diff --git a/server/stack.yaml b/server/stack.yaml
index 74734a0..8d583aa 100644
--- a/server/stack.yaml
+++ b/server/stack.yaml
@@ -3,3 +3,5 @@ packages:
 - '.'
 extra-deps:
 - 'vector-shuffling-1.1'
+nix:
+  packages: ["zlib.dev", "zlib.out"]
-- 
cgit v1.2.3