From 36eb48ab3caa909e9a7ce487c402af607cea35e7 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Thu, 28 Dec 2023 04:32:31 +0400 Subject: [PATCH] nix flake lock /etc/nixos --override-input sp-modules path:./sp-modules --- .drone.yml | 2 +- nixos-infect | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d8045e9..4127996 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ steps: trap 'echo \$LINENO: "\$BASH_COMMAND"; exit 1' ERR API_TOKEN="$USER_PASS" - CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/0f886d76e93dd366db7c53a8f6b672702910b99b.tar.gz + CONFIG_URL=https://git.selfprivacy.org/api/v1/repos/SelfPrivacy/selfprivacy-nixos-template/archive/9343332f1206995957f5c8e61ee2d7eafbbe6131.tar.gz DNS_PROVIDER_TOKEN=$CLOUDFLARE_TOKEN DNS_PROVIDER_TYPE=CLOUDFLARE DOMAIN=$DOMAIN diff --git a/nixos-infect b/nixos-infect index eefcf68..a4f6fc5 100755 --- a/nixos-infect +++ b/nixos-infect @@ -480,7 +480,9 @@ installNix() { infect() { # this is needed solely for accepting the sp-module sub-flake # see https://github.com/NixOS/nix/issues/3978#issuecomment-952418478 - $NIX "${NIX_OPTS[@]}" flake lock ${LOCAL_FLAKE_DIR} --update-input sp-modules + cd /etc/nixos || return 1 + $NIX "${NIX_OPTS[@]}" flake lock ${LOCAL_FLAKE_DIR} \ + --override-input sp-modules path:./sp-modules echo "nix build the configuration flake..." if ! $NIX "${NIX_OPTS[@]}" build \