From edf9ed431614b552db009a86ccf96813e0dee9be Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 7 Jan 2021 01:56:20 +0100 Subject: [PATCH] Fix private build --- nixos/roles/laminar/test-config.nix | 1 + private | 2 +- private.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix index 4ae391d6..f2702b36 100644 --- a/nixos/roles/laminar/test-config.nix +++ b/nixos/roles/laminar/test-config.nix @@ -5,6 +5,7 @@ let set -ex export PATH=${lib.makeBinPath path}:$PATH export NIX_PATH="/etc/nix-path:nixos-config=/etc/nixos/configuration.nix" + export GIT_SSH_COMMAND="ssh -vv" cd /var/cache/gc-links ''; in { diff --git a/private b/private index dad66828..3b12c89e 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit dad66828a5c47029e33e8e8e156640608c66cf2f +Subproject commit 3b12c89ea2045730c024d3e382ac610a7166b620 diff --git a/private.nix b/private.nix index 5c7d75d5..f7b159a8 100644 --- a/private.nix +++ b/private.nix @@ -11,7 +11,7 @@ in { inherit withSecrets; privatePath = name: let path = "/etc/nixos/private/${name}"; - in if withSecrets then assert builtins.pathExists path; path else path; + in if withSecrets then assert builtins.pathExists (./private + "/${name}"); path else path; privateValue = default: name: if withSecrets then import (./private + "/${name}.nix") else default; privateFile = name: