about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-09-14T23·11+0200
committersterni <sternenseemann@systemli.org>2021-09-15T12·36+0000
commit922af58cce891340b6370cf30c16a297d7d4b7fc (patch)
tree7dbc3b3bcf3236c5306b935b9a0966506842e209
parenta61d9608fae5d04cc41e7d18e5fb6dd4f9b0cdbc (diff)
fix(bin): correct outdated attribute paths r/2865
* Mostly stale attribute specifications due to the third_party ->
  third_party.nixpkgs migration.

* kontemplate is ops.kontemplate.

* tazjin's rebuilder seems to no longer exist.

Change-Id: Ic97468f9e73cb0ba7df740c3807ca011e385e357
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3550
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
-rwxr-xr-xbin/__dispatch.sh17
l---------bin/rebuilder1
2 files changed, 7 insertions, 11 deletions
diff --git a/bin/__dispatch.sh b/bin/__dispatch.sh
index e304d86b7971..0a049c1ecb20 100755
--- a/bin/__dispatch.sh
+++ b/bin/__dispatch.sh
@@ -11,10 +11,10 @@ TARGET_TOOL=$(basename "$0")
 
 case "${TARGET_TOOL}" in
   age)
-    attr="third_party.age"
+    attr="third_party.nixpkgs-age"
     ;;
   age-keygen)
-    attr="third_party.age"
+    attr="third_party.nixpkgs.age"
     ;;
   depot-build)
     attr="tools.depot-build"
@@ -32,13 +32,13 @@ case "${TARGET_TOOL}" in
     attr="tools.hash-password"
     ;;
   kontemplate)
-    attr="kontemplate"
+    attr="ops.kontemplate"
     ;;
   meson)
-    attr="third_party.meson"
+    attr="third_party.nixpkgs.meson"
     ;;
   ninja)
-    attr="third_party.ninja"
+    attr="third_party.nixpkgs.ninja"
     ;;
   nint)
     attr="nix.nint"
@@ -49,14 +49,11 @@ case "${TARGET_TOOL}" in
   rebuild-system)
     attr="ops.nixos.rebuild-system"
     ;;
-  rebuilder)
-    attr="users.tazjin.nixos.rebuilder"
-    ;;
   rink)
-    attr="third_party.rink"
+    attr="third_party.nixpkgs.rink"
     ;;
   stern)
-    attr="third_party.stern"
+    attr="third_party.nixpkgs.stern"
     ;;
   *)
     echo "The tool '${TARGET_TOOL}' is currently not installed in this repository."
diff --git a/bin/rebuilder b/bin/rebuilder
deleted file mode 120000
index 8390ec9c9652..000000000000
--- a/bin/rebuilder
+++ /dev/null
@@ -1 +0,0 @@
-__dispatch.sh
\ No newline at end of file