summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authormakefu <makefu@tsp>2015-08-13 12:02:38 +0200
committermakefu <makefu@tsp>2015-08-13 12:02:38 +0200
commit4d08db7462dd9065f30093a24c701e0f072c42f3 (patch)
treed874216e3a3671076dd3963dfb0766ea82b61f63 /Makefile
parentab2d3f96be09e4a77f33b7ce2f3b96dbc9b57c39 (diff)
parent7c578b1cad5d33c4a2773459ef62a8a72c585972 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ca828fd2b..54656e9e1 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ deploy:;@
eval:
@
ifeq ($(filter),json)
- extraArgs=--json
+ extraArgs='--json --strict'
filter() { jq -r .; }
else
filter() { cat; }
@@ -33,8 +33,6 @@ endif
NIX_PATH=stockholm=$$PWD:$$NIX_PATH \
nix-instantiate \
$${extraArgs-} \
- $${json+--json} \
- $${json+--strict} \
--eval \
-A "$$get" \
'<stockholm>' \
[cgit] Unable to lock slot /tmp/cgit/9e100000.lock: No such file or directory (2)