diff options
| author | tv <tv@krebsco.de> | 2016-02-02 03:29:42 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-02 03:29:42 +0100 |
| commit | 1b67c62f15e1c92aa1ccdf392fcdfe85488e3f48 (patch) | |
| tree | 6342c115307c61bb47d86386883cdf98cbb39f0c | |
| parent | 8e219cd0a2446e8f141e0f2403413a9bd3f0b061 (diff) | |
make populate: define and pass lib to krebs/v2
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | krebs/v2/default.nix | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -55,14 +55,18 @@ endif # usage: make populate system=foo [target=bar] .PHONY: populate +populate: export lib = \ + let nlib = import <nixpkgs/lib>; in \ + nlib // import krebs/4lib { lib = nlib; } // builtins populate: export source = \ - with (import ~/stockholm {}).users.$(LOGNAME).$(system).config.krebs.build; \ + with (import ./. {}).users.$(LOGNAME).$(system).config.krebs.build; \ assert source-version == 2; \ source populate:;@ result=$$(nix-instantiate \ --eval \ --json \ + --arg lib "$$lib" \ --arg source "$$source" \ --argstr target-host "$$target" \ --argstr target-path /var/src \ diff --git a/krebs/v2/default.nix b/krebs/v2/default.nix index 78e990d1c..ac1c13e72 100644 --- a/krebs/v2/default.nix +++ b/krebs/v2/default.nix @@ -1,13 +1,10 @@ -{ source +{ lib +, source , target-user ? "root" , target-host , target-path ? "/var/src" }: -with import <nixpkgs/lib>; -with import ~/stockholm/krebs/4lib { - lib = import <nixpkgs/lib>; -}; -with builtins; +with lib; let out = { inherit populate; |