mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: simplify the .envrc loading

Browse source 
nix-shell pollutes the environment with all sorts of variables. Let's
just add the tools to the PATH?

This also papers over the various differences in users `use_nix`
implementations by not using it at all.

Change-Id: If4282531fd6b7453b3611fe50217beacadc08bb5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5524
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
zimbatm 2022-05-05 19:18:01 +02:00 committed by Jonas Chevalier
parent 7406e95954
commit c56a0e2760
2 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.envrc
View file

@ -1,4 +1,7 @@
# Configure the local PATH to contain tools which are fetched ad-hoc
# from Nix.
use nix -A tools.depot-deps
out=$(nix-build -A tools.depot-deps --no-out-link)
PATH_add "$out"
watch_file tools/depot-deps.nix

47
tools/depot-deps.nix
View file

@ -2,33 +2,26 @@
# that should be lazily made available in depot.
{ pkgs, depot, ... }:
let
deps = depot.nix.lazy-deps {
age-keygen.attr = "third_party.nixpkgs.age";
age.attr = "third_party.nixpkgs.age";
depotfmt.attr = "tools.depotfmt";
gerrit-update.attr = "tools.gerrit-update";
gerrit.attr = "tools.gerrit-cli";
hash-password.attr = "tools.hash-password";
mg.attr = "tools.magrathea";
nint.attr = "nix.nint";
niv.attr = "third_party.nixpkgs.niv";
rebuild-system.attr = "ops.nixos.rebuildSystem";
rink.attr = "third_party.nixpkgs.rink";
depot.nix.lazy-deps {
age-keygen.attr = "third_party.nixpkgs.age";
age.attr = "third_party.nixpkgs.age";
depotfmt.attr = "tools.depotfmt";
gerrit-update.attr = "tools.gerrit-update";
gerrit.attr = "tools.gerrit-cli";
hash-password.attr = "tools.hash-password";
mg.attr = "tools.magrathea";
nint.attr = "nix.nint";
niv.attr = "third_party.nixpkgs.niv";
rebuild-system.attr = "ops.nixos.rebuildSystem";
rink.attr = "third_party.nixpkgs.rink";
tf-glesys = {
attr = "ops.glesys.terraform";
cmd = "terraform";
};
tf-keycloak = {
attr = "ops.keycloak.terraform";
cmd = "terraform";
};
tf-glesys = {
attr = "ops.glesys.terraform";
cmd = "terraform";
};
tf-keycloak = {
attr = "ops.keycloak.terraform";
cmd = "terraform";
};
in
pkgs.mkShell {
buildInputs = [
deps
];
}