feat(wpcarro/lazy-deps): Support wpcarro-deps r/5411

Replace legacy lazy-deps with the latest pattern.

Change-Id: If0b0798d76f63b8a42b222398c043f26e9035e42
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7576
Reviewed-by: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
Autosubmit: wpcarro <wpcarro@gmail.com>

7 files changed, 13 insertions, 37 deletions

diff --git a/users/wpcarro/.gitignore b/users/wpcarro/.gitignore
index 2380eb7b668e..64703ed12903 100644
--- a/users/wpcarro/.gitignore
+++ b/users/wpcarro/.gitignore
@@ -30,3 +30,6 @@ node_modules/
 .gitsecret/keys/random_seed
 !*.secret
 secrets.json
+
+# Nix gcroots symlinks created by .envrc
+/.gcroots/*
diff --git a/users/wpcarro/bin/__dispatch.sh b/users/wpcarro/bin/__dispatch.sh
deleted file mode 100755
index 6da9a1c416cf..000000000000
--- a/users/wpcarro/bin/__dispatch.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-# This script dispatches invocations transparently to programs instantiated from
-# Nix.
-#
-# To add a new tool, insert it into the case statement below by setting `attr`
-# to the key in nixpkgs which represents the program you want to run.
-set -ueo pipefail
-
-TARGET_TOOL=$(basename "$0")
-
-case "${TARGET_TOOL}" in
-  deploy-diogenes)
-    attr="users.wpcarro.nixos.deploy-diogenes"
-    ;;
-  rebuild-diogenes)
-    attr="users.wpcarro.nixos.rebuild-diogenes"
-    ;;
-  import-gpg)
-    attr="users.wpcarro.configs.import-gpg"
-    ;;
-  export-gpg)
-    attr="users.wpcarro.configs.export-gpg"
-    ;;
-  *)
-    echo "The tool '${TARGET_TOOL}' is currently not installed in this repository."
-    exit 1
-    ;;
-esac
-
-result=$(nix-build --no-out-link --attr "${attr}" "${REPO_ROOT}")
-PATH="${result}/bin:$PATH"
-
-exec "${TARGET_TOOL}" "${@}"
diff --git a/users/wpcarro/bin/deploy-diogenes b/users/wpcarro/bin/deploy-diogenes
deleted file mode 120000
index 8390ec9c9652..000000000000
--- a/users/wpcarro/bin/deploy-diogenes
+++ /dev/null
@@ -1 +0,0 @@
-__dispatch.sh
\ No newline at end of file
diff --git a/users/wpcarro/bin/export-gpg b/users/wpcarro/bin/export-gpg
deleted file mode 120000
index 8390ec9c9652..000000000000
--- a/users/wpcarro/bin/export-gpg
+++ /dev/null
@@ -1 +0,0 @@
-__dispatch.sh
\ No newline at end of file
diff --git a/users/wpcarro/bin/import-gpg b/users/wpcarro/bin/import-gpg
deleted file mode 120000
index 8390ec9c9652..000000000000
--- a/users/wpcarro/bin/import-gpg
+++ /dev/null
@@ -1 +0,0 @@
-__dispatch.sh
\ No newline at end of file
diff --git a/users/wpcarro/bin/rebuild-diogenes b/users/wpcarro/bin/rebuild-diogenes
deleted file mode 120000
index 8390ec9c9652..000000000000
--- a/users/wpcarro/bin/rebuild-diogenes
+++ /dev/null
@@ -1 +0,0 @@
-__dispatch.sh
\ No newline at end of file
diff --git a/users/wpcarro/tools/wpcarro-deps.nix b/users/wpcarro/tools/wpcarro-deps.nix
new file mode 100644
index 000000000000..a359dfb746e8
--- /dev/null
+++ b/users/wpcarro/tools/wpcarro-deps.nix
@@ -0,0 +1,10 @@
+# Shell derivation to invoke //nix/lazy-deps with the dependencies that should
+# be lazily made available in wpcarro's users dir in depot.
+{ pkgs, depot, ... }:
+
+depot.nix.lazy-deps {
+  deploy-diogenes.attr = "users.wpcarro.nixos.deploy-diogenes";
+  rebuild-diogenes.attr = "users.wpcarro.nixos.rebuild-diogenes";
+  import-gpg.attr = "users.wpcarro.configs.import-gpg";
+  export-gpg.attr = "users.wpcarro.configs.export-gpg";
+}