From a0208307ae1a8069559af39953569275a6d7ee6d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Jul 2017 19:32:41 +0200 Subject: [PATCH 1/2] make install: repair by using source.nix --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0a9b4f29f..f25830789 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,13 @@ ifneq ($(ssh),) populate: populate-flags += --ssh=$(ssh) endif populate: - $(call evaluate,config.krebs.build.source) --json --strict | \ + nix-instantiate \ + --eval \ + --json \ + --readonly-mode \ + --show-trace \ + --strict \ + $(LOGNAME)/1systems/$(system)/source.nix | \ populate $(populate-target) $(populate-flags) # usage: make pkgs.populate From 67bfd42d630e0d72bbee91931fbfae4f79d309c3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Jul 2017 20:20:32 +0200 Subject: [PATCH 2/2] infest prepare: sed NIX_PATH more lenient --- krebs/4lib/infest/prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index 50d521e17..d39aca348 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -102,7 +102,7 @@ prepare_nixos_iso() { mkdir -p bin rm -f bin/nixos-install cp "$(type -p nixos-install)" bin/nixos-install - sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install + sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install } get_nixos_install() {