From fc3f5d3d56a299b7b46c1a42d3fec57c536a5917 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 8 Jul 2017 14:58:09 +0200
Subject: shell: don't populate when source doesn't evaluate
---
shell.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/shell.nix b/shell.nix
index 83ff7f039..e0c60e330 100644
--- a/shell.nix
+++ b/shell.nix
@@ -85,18 +85,19 @@ let
};
populate = pkgs.writeDash "init.env.populate" ''
set -efu
- ${pkgs.nix}/bin/nix-instantiate \
+ _source=$(${pkgs.nix}/bin/nix-instantiate \
--eval \
--json \
--readonly-mode \
--show-trace \
--strict \
-I nixos-config="$config" \
- -E 'with import <stockholm>; config.krebs.build.source' \
- |
+ -E 'with import <stockholm>; config.krebs.build.source')
+ echo $_source |
${pkgs.populate}/bin/populate \
"$target_user@$target_host:$target_port$target_path" \
>&2
+ unset _source
'';
proxy = pkgs.writeDash "init.env.proxy" ''
set -efu
--
cgit v1.2.3