maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Replace 'depotPath' with 'depot.path'

Browse source 
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 <flokli@flokli.de>
Change-Id: I2c0db23383fc34f6ca76baaad4cc4af2d9dfae15
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2962
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-12 22:26:55 +02:00 • committed by tazjin
parent a559135970
commit f520bd40ca
12 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ops/machines/whitby/default.nix
View file

@ -6,26 +6,26 @@ let
inherit (lib) range;
in lib.fix(self: {
imports = [
"${depot.depotPath}/ops/modules/clbot.nix"
"${depot.depotPath}/ops/modules/irccat.nix"
"${depot.depotPath}/ops/modules/monorepo-gerrit.nix"
"${depot.depotPath}/ops/modules/panettone.nix"
"${depot.depotPath}/ops/modules/paroxysm.nix"
"${depot.depotPath}/ops/modules/smtprelay.nix"
"${depot.depotPath}/ops/modules/sourcegraph.nix"
"${depot.depotPath}/ops/modules/tvl-buildkite.nix"
"${depot.depotPath}/ops/modules/tvl-slapd/default.nix"
"${depot.depotPath}/ops/modules/tvl-sso/default.nix"
"${depot.depotPath}/ops/modules/www/b.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/cache.tvl.su.nix"
"${depot.depotPath}/ops/modules/www/cl.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/code.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/cs.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/login.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/tazj.in.nix"
"${depot.depotPath}/ops/modules/www/todo.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/wigglydonke.rs.nix"
"${depot.path}/ops/modules/clbot.nix"
"${depot.path}/ops/modules/irccat.nix"
"${depot.path}/ops/modules/monorepo-gerrit.nix"
"${depot.path}/ops/modules/panettone.nix"
"${depot.path}/ops/modules/paroxysm.nix"
"${depot.path}/ops/modules/smtprelay.nix"
"${depot.path}/ops/modules/sourcegraph.nix"
"${depot.path}/ops/modules/tvl-buildkite.nix"
"${depot.path}/ops/modules/tvl-slapd/default.nix"
"${depot.path}/ops/modules/tvl-sso/default.nix"
"${depot.path}/ops/modules/www/b.tvl.fyi.nix"
"${depot.path}/ops/modules/www/cache.tvl.su.nix"
"${depot.path}/ops/modules/www/cl.tvl.fyi.nix"
"${depot.path}/ops/modules/www/code.tvl.fyi.nix"
"${depot.path}/ops/modules/www/cs.tvl.fyi.nix"
"${depot.path}/ops/modules/www/login.tvl.fyi.nix"
"${depot.path}/ops/modules/www/tazj.in.nix"
"${depot.path}/ops/modules/www/todo.tvl.fyi.nix"
"${depot.path}/ops/modules/www/tvl.fyi.nix"
"${depot.path}/ops/modules/www/wigglydonke.rs.nix"
"${pkgs.path}/nixos/modules/services/web-apps/gerrit.nix"
];

2
ops/modules/www/wigglydonke.rs.nix
View file

@ -9,7 +9,7 @@
services.nginx.virtualHosts."wigglydonke.rs" = {
enableACME = true;
forceSSL = true;
root = "${depot.depotPath}/users/grfn/wigglydonke.rs";
root = "${depot.path}/users/grfn/wigglydonke.rs";
};
};
}

2
ops/nixos.nix
View file

@ -33,7 +33,7 @@ in rec {
fi
echo "Rebuilding NixOS for $HOSTNAME"
system=$(nix-build -E "((import ${toString depot.depotPath} {}).ops.nixos.findSystem \"$HOSTNAME\").system" --no-out-link --show-trace)
system=$(nix-build -E "((import ${toString depot.path} {}).ops.nixos.findSystem \"$HOSTNAME\").system" --no-out-link --show-trace)
nix-env -p /nix/var/nix/profiles/system --set $system
$system/bin/switch-to-configuration switch