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 <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

View file

@ -207,7 +207,7 @@ let
] ++ [
"${bins.nint}"
# always pass depot so scripts can use this library
"--arg depot '(import ${depot.depotPath} {})'"
"--arg depot '(import ${depot.path} {})'"
]);
in runExecline.local drvName {} [
"importas" "out" "out"

View file

@ -35,7 +35,7 @@ let
};
allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" {} ''
${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.depotPath} | \
${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \
${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
''));