Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make eval: don't use $json anymore

Browse Source
This commit is contained in:
tv 2015-08-05 15:24:50 +02:00
parent a385b9a4ec
commit 662f22a1dd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -25,7 +25,7 @@ deploy:;@
eval: eval:
@ @
ifeq ($(filter),json) ifeq ($(filter),json)
extraArgs=--json extraArgs='--json --strict'
filter() { jq -r .; } filter() { jq -r .; }
else else
filter() { cat; } filter() { cat; }
@ -33,8 +33,6 @@ endif
NIX_PATH=stockholm=$$PWD:$$NIX_PATH \ NIX_PATH=stockholm=$$PWD:$$NIX_PATH \
nix-instantiate \ nix-instantiate \
$${extraArgs-} \ $${extraArgs-} \
$${json+--json} \
$${json+--strict} \
--eval \ --eval \
-A "$$get" \ -A "$$get" \
'<stockholm>' \ '<stockholm>' \