diff options
| author | tv <tv@krebsco.de> | 2016-05-20 03:02:35 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-05-20 03:27:42 +0200 |
| commit | 47a9308fc9eb41f7fe1f5d160a45e6a23e9f12d1 (patch) | |
| tree | e135ed9434e366bb69404ea84fa108d2c1fd35b8 | |
| parent | 28d623cf98b5d5b0f23b1b7761c884b8631b8f78 (diff) | |
Makefile evaluate: provide access to all of stockholm
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -54,9 +54,7 @@ evaluate = \ --show-trace \ -I nixos-config=$(nixos-config) \ -I stockholm=$(stockholm) \ - -E '{ eval, f }: f eval' \ - --arg eval 'import ./.' \ - --arg f "eval@{ config, ... }: $(1)" + -E "let eval = import <stockholm>; in with eval; $(1)" execute = \ result=$$($(call evaluate,config.krebs.build.$(1))) && \ @@ -77,7 +75,7 @@ deploy: # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate,$${expr-eval}) -eval.%:;@$(call evaluate,$*) +eval.%:;@$(call evaluate,$@) # usage: make install system=foo [target_host=bar] install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null |