From 46d71fbff86bb0cc8f6d520f3afcd7aaa72c3195 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 26 May 2022 14:47:30 +0200 Subject: [PATCH] refactor(wpcarro): Prepare for restricted-eval Change-Id: Ieb3b28d56ecd2819c3a7c08c22e33493d9e0be7f Reviewed-on: https://cl.tvl.fyi/c/depot/+/5687 Tested-by: BuildkiteCI Reviewed-by: wpcarro Reviewed-by: sterni --- users/wpcarro/nixos/diogenes/default.nix | 2 +- users/wpcarro/nixos/marcus/default.nix | 4 ++-- users/wpcarro/terraform/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix index 9f80d0b1b..022570e3d 100644 --- a/users/wpcarro/nixos/diogenes/default.nix +++ b/users/wpcarro/nixos/diogenes/default.nix @@ -36,7 +36,7 @@ wpcarro.terraform.googleCloudVM { configuration = { imports = [ - "${depot.path}/ops/modules/quassel.nix" + (depot.path.origSrc + "/ops/modules/quassel.nix") ]; networking = { diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 1957070df..0dc4fc57f 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -16,8 +16,8 @@ let in { imports = [ - (depot.path + "/users/wpcarro/nixos/marcus/hardware.nix") - "${pkgs.home-manager.src}/nixos" + (depot.path.origSrc + "/users/wpcarro/nixos/marcus/hardware.nix") + (pkgs.home-manager.src + "/nixos") ]; # Use the TVL binary cache diff --git a/users/wpcarro/terraform/default.nix b/users/wpcarro/terraform/default.nix index 55b68451b..b8625c3b8 100644 --- a/users/wpcarro/terraform/default.nix +++ b/users/wpcarro/terraform/default.nix @@ -5,7 +5,7 @@ let inherit (depot.users) wpcarro; inherit (pkgs) writeText; - images = import "${pkgs.path}/nixos/modules/virtualisation/gce-images.nix"; + images = import (pkgs.path + "/nixos/modules/virtualisation/gce-images.nix"); nixosImage = images."20.09"; in { @@ -31,7 +31,7 @@ in os = depot.ops.nixos.nixosFor (_: { imports = [ - "${pkgs.path}/nixos/modules/virtualisation/google-compute-image.nix" + (pkgs.path + "/nixos/modules/virtualisation/google-compute-image.nix") configuration ];