From e81280732444f492894b7b47ce38a2b3293a31d1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 May 2022 12:40:50 +0200 Subject: refactor: Replace //bin with //tools/depot-deps This modifies the envrc configuration to add the result of building //tools/depot-deps to $PATH, instead of dispatching through the manually maintained list of symlinks. While at it, I've cleaned up some stuff from that list that is no longer actually used. Change-Id: If345c44da75b23c06b7c7f435be0cb02f99aaac5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5513 Tested-by: BuildkiteCI Reviewed-by: ezemtsov --- tools/depot-deps.nix | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tools/depot-deps.nix (limited to 'tools') diff --git a/tools/depot-deps.nix b/tools/depot-deps.nix new file mode 100644 index 0000000000..c805746c89 --- /dev/null +++ b/tools/depot-deps.nix @@ -0,0 +1,34 @@ +# Shell derivation to invoke //nix/lazy-deps with the dependencies +# 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"; + + tf-glesys = { + attr = "ops.glesys.terraform"; + cmd = "terraform"; + }; + + tf-keycloak = { + attr = "ops.keycloak.terraform"; + cmd = "terraform"; + }; + }; +in +pkgs.mkShell { + buildInputs = [ + deps + ]; +} -- cgit 1.4.1