From f520bd40cab9bae4f8fa26fe36365a7bf9bccd5a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 12 Apr 2021 22:26:55 +0200 Subject: refactor: Replace 'depotPath' with 'depot.path' Instead of having two ways of accessing the path to the depot (one of which was stuttering, depot.depotPath) we settle on only one: depot.path. This was mostly used for NixOS module imports. Co-Authored-By: Florian Klink Change-Id: I2c0db23383fc34f6ca76baaad4cc4af2d9dfae15 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2962 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: sterni --- users/tazjin/nixos/camden/default.nix | 4 ++-- users/tazjin/nixos/frog/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'users/tazjin/nixos') diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix index 2659db5e91d9..eae359ccec1b 100644 --- a/users/tazjin/nixos/camden/default.nix +++ b/users/tazjin/nixos/camden/default.nix @@ -25,8 +25,8 @@ in lib.fix(self: { sha256 = "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr"; }; in [ - "${depot.depotPath}/ops/modules/quassel.nix" - "${depot.depotPath}/ops/modules/smtprelay.nix" + "${depot.path}/ops/modules/quassel.nix" + "${depot.path}/ops/modules/smtprelay.nix" "${oldChannel}/nixos/modules/security/acme.nix" ]; diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 1394f9cf4e91..0b74d3e575a8 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -16,7 +16,7 @@ config: let }; in lib.fix(self: { imports = [ - "${depot.depotPath}/ops/modules/v4l2loopback.nix" + "${depot.path}/ops/modules/v4l2loopback.nix" ]; boot = { -- cgit 1.4.1