diff options
| author | lassulus <lass@aidsballs.de> | 2015-08-13 22:36:07 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-08-13 22:36:07 +0200 |
| commit | cc1baf4d385e45b8c9f0509c04e8883f48ade6ae (patch) | |
| tree | 9eb6a04cdb91414d662409e7f8b3b2e396f92895 /Makefile | |
| parent | dbd69c4e956bc1c88b379c273a5ea5b4ceea8813 (diff) | |
| parent | db4b55527d527158bd4e7f93128668e646f2cf1f (diff) | |
Merge branch 'tv' into newmaster
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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>' \ |