make eval: don't use $json anymore

This commit is contained in:
tv 2015-08-05 15:24:50 +02:00
parent a385b9a4ec
commit 662f22a1dd

View File

@ -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>' \