diff options
| author | makefu <makefu@tsp> | 2015-08-13 12:02:38 +0200 |
|---|---|---|
| committer | makefu <makefu@tsp> | 2015-08-13 12:02:38 +0200 |
| commit | f189d5077565b4daee944c10f2ccacdeac3e74c9 (patch) | |
| tree | 3e807c706c5939a701424000a50422b2ca06a8f3 /Makefile | |
| parent | 242829c6949b1666ea8a0805f3b22c0221655954 (diff) | |
| parent | 47e8797f9b4715930bb64176d25779f82cfe55d7 (diff) | |
Merge remote-tracking branch 'cd/master'
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>' \ |