mdebray/tvl-depot
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
default.nix
View file

@ -47,12 +47,7 @@ let
(node.meta.targets or [])) (node.meta.targets or []))
else []; else [];
# Make the path to the depot available for things that might need it
# (e.g. NixOS module inclusions)
depotPath = ./.;
in fix(self: (readTree' { in fix(self: (readTree' {
# TODO(tazjin): Settle on one way of using depotPath
inherit depotPath;
depot = self; depot = self;
# Pass third_party as 'pkgs' (for compatibility with external # Pass third_party as 'pkgs' (for compatibility with external
@ -69,7 +64,9 @@ in fix(self: (readTree' {
# debugging by bisecting nixpkgs. # debugging by bisecting nixpkgs.
externalArgs = args; externalArgs = args;
} ./.) // { } ./.) // {
inherit depotPath; # Make the path to the depot available for things that might need it
# (e.g. NixOS module inclusions)
path = ./.;
# List of all buildable targets, for CI purposes. # List of all buildable targets, for CI purposes.
# #

2
docs/designs/SPARSE_CHECKOUTS.md
View file

@ -9,7 +9,7 @@ Open items:
the closure of a given source directory, using [depot-scan]. the closure of a given source directory, using [depot-scan].
```bash ```bash
DEPOT_ROOT="${depot.depotPath}" DEPOT_ROOT="${depot.path}"
XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
CLIENT_ROOT="$XDG_DATA_HOME/tvlc/clients" CLIENT_ROOT="$XDG_DATA_HOME/tvlc/clients"
NICE_CHECKOUT_ROOT="$HOME/tvlc" NICE_CHECKOUT_ROOT="$HOME/tvlc"

4
nix/bufCheck/default.nix
View file

@ -3,7 +3,7 @@
{ depot, pkgs, ... }: { depot, pkgs, ... }:
pkgs.writeShellScriptBin "ci-buf-check" '' pkgs.writeShellScriptBin "ci-buf-check" ''
${depot.third_party.bufbuild}/bin/buf check lint --input "${depot.depotPath}" ${depot.third_party.bufbuild}/bin/buf check lint --input "${depot.path}"
# Report-only # Report-only
${depot.third_party.bufbuild}/bin/buf check breaking --input "${depot.depotPath}" --against-input "${depot.depotPath}/.git#branch=canon" || true ${depot.third_party.bufbuild}/bin/buf check breaking --input "${depot.path}" --against-input "${depot.path}/.git#branch=canon" || true
'' ''

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

@ -6,26 +6,26 @@ let
inherit (lib) range; inherit (lib) range;
in lib.fix(self: { in lib.fix(self: {
imports = [ imports = [
"${depot.depotPath}/ops/modules/clbot.nix" "${depot.path}/ops/modules/clbot.nix"
"${depot.depotPath}/ops/modules/irccat.nix" "${depot.path}/ops/modules/irccat.nix"
"${depot.depotPath}/ops/modules/monorepo-gerrit.nix" "${depot.path}/ops/modules/monorepo-gerrit.nix"
"${depot.depotPath}/ops/modules/panettone.nix" "${depot.path}/ops/modules/panettone.nix"
"${depot.depotPath}/ops/modules/paroxysm.nix" "${depot.path}/ops/modules/paroxysm.nix"
"${depot.depotPath}/ops/modules/smtprelay.nix" "${depot.path}/ops/modules/smtprelay.nix"
"${depot.depotPath}/ops/modules/sourcegraph.nix" "${depot.path}/ops/modules/sourcegraph.nix"
"${depot.depotPath}/ops/modules/tvl-buildkite.nix" "${depot.path}/ops/modules/tvl-buildkite.nix"
"${depot.depotPath}/ops/modules/tvl-slapd/default.nix" "${depot.path}/ops/modules/tvl-slapd/default.nix"
"${depot.depotPath}/ops/modules/tvl-sso/default.nix" "${depot.path}/ops/modules/tvl-sso/default.nix"
"${depot.depotPath}/ops/modules/www/b.tvl.fyi.nix" "${depot.path}/ops/modules/www/b.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/cache.tvl.su.nix" "${depot.path}/ops/modules/www/cache.tvl.su.nix"
"${depot.depotPath}/ops/modules/www/cl.tvl.fyi.nix" "${depot.path}/ops/modules/www/cl.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/code.tvl.fyi.nix" "${depot.path}/ops/modules/www/code.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/cs.tvl.fyi.nix" "${depot.path}/ops/modules/www/cs.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/login.tvl.fyi.nix" "${depot.path}/ops/modules/www/login.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/tazj.in.nix" "${depot.path}/ops/modules/www/tazj.in.nix"
"${depot.depotPath}/ops/modules/www/todo.tvl.fyi.nix" "${depot.path}/ops/modules/www/todo.tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/tvl.fyi.nix" "${depot.path}/ops/modules/www/tvl.fyi.nix"
"${depot.depotPath}/ops/modules/www/wigglydonke.rs.nix" "${depot.path}/ops/modules/www/wigglydonke.rs.nix"
"${pkgs.path}/nixos/modules/services/web-apps/gerrit.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" = { services.nginx.virtualHosts."wigglydonke.rs" = {
enableACME = true; enableACME = true;
forceSSL = 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 fi
echo "Rebuilding NixOS for $HOSTNAME" 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 nix-env -p /nix/var/nix/profiles/system --set $system
$system/bin/switch-to-configuration switch $system/bin/switch-to-configuration switch

3
third_party/nix/default.nix vendored
View file

@ -3,7 +3,6 @@ args@{
, pkgs ? depot.third_party.nixpkgs , pkgs ? depot.third_party.nixpkgs
, lib , lib
, buildType ? "release" , buildType ? "release"
, depotPath ? ../..
, ... , ...
}: }:
@ -198,7 +197,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
installCheckInputs = up.installCheckInputs ++ [run_clang_tidy]; installCheckInputs = up.installCheckInputs ++ [run_clang_tidy];
shellHook = '' shellHook = ''
export NIX_DATA_DIR="${toString depotPath}/third_party" export NIX_DATA_DIR="${toString depot.path}/third_party"
export NIX_TEST_VAR=foo export NIX_TEST_VAR=foo
''; '';
}); });

2
third_party/nix/test-vm.nix vendored
View file

@ -11,7 +11,7 @@ let
virtualisation.qemu.options = [ "-nographic" "-curses" ]; virtualisation.qemu.options = [ "-nographic" "-curses" ];
nix.nixPath = [ nix.nixPath = [
"depot=${depot.depotPath}" "depot=${depot.path}"
]; ];
}; };

4
users/tazjin/nixos/camden/default.nix
View file

@ -25,8 +25,8 @@ in lib.fix(self: {
sha256 = "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr"; sha256 = "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr";
}; };
in [ in [
"${depot.depotPath}/ops/modules/quassel.nix" "${depot.path}/ops/modules/quassel.nix"
"${depot.depotPath}/ops/modules/smtprelay.nix" "${depot.path}/ops/modules/smtprelay.nix"
"${oldChannel}/nixos/modules/security/acme.nix" "${oldChannel}/nixos/modules/security/acme.nix"
]; ];

2
users/tazjin/nixos/frog/default.nix
View file

@ -16,7 +16,7 @@ config: let
}; };
in lib.fix(self: { in lib.fix(self: {
imports = [ imports = [
"${depot.depotPath}/ops/modules/v4l2loopback.nix" "${depot.path}/ops/modules/v4l2loopback.nix"
]; ];
boot = { boot = {

2
web/bubblegum/default.nix
View file

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

2
web/todolist/default.nix
View file

@ -35,7 +35,7 @@ let
}; };
allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" {} '' 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 ${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
'')); ''));