From 318d10e60875ef69132651668a249de75730d2ba Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 9 Sep 2021 18:26:03 +0200 Subject: chore(nint): move from //users/sterni to //nix Since //web/bubblegum depends on nint, we need to move it to a non user directory to conform with the policy established via cl/3434. Note that this likely doesn't mean greater stability (which isn't really implied in depot anyways), since I still would like to use a more elaborate calling convention to allow for additional useful features. Change-Id: I616f905d8df13e3363674aab69a797b0d39fdd79 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3506 Tested-by: BuildkiteCI Reviewed-by: tazjin --- web/bubblegum/README.md | 2 +- web/bubblegum/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'web/bubblegum') diff --git a/web/bubblegum/README.md b/web/bubblegum/README.md index 0e09c1c65e..48c2ba6e03 100644 --- a/web/bubblegum/README.md +++ b/web/bubblegum/README.md @@ -2,7 +2,7 @@ `bubblegum` is a CGI programming library for the Nix expression language. It provides a few helpers to make writing CGI scripts which are executable -using [//users/sterni/nint](../../users/sterni/nint/README.md) convenient. +using [//nix/nint](../../nix/nint/README.md) convenient. An example nix.cgi script looks like this (don't worry about the shebang too much, you can use `web.bubblegum.writeCGI` to set this up without diff --git a/web/bubblegum/default.nix b/web/bubblegum/default.nix index 0ad541390b..2db6f04204 100644 --- a/web/bubblegum/default.nix +++ b/web/bubblegum/default.nix @@ -7,6 +7,7 @@ let getBins utils sparseTree + nint ; minimalDepot = sparseTree depot.path [ @@ -186,7 +187,7 @@ let else "${scriptName}/${path}"; bins = getBins pkgs.coreutils [ "env" "tee" "cat" "printf" "chmod" ] - // getBins depot.users.sterni.nint [ "nint" ]; + // getBins nint [ "nint" ]; /* Type: args -> either path derivation string -> derivation */ -- cgit 1.4.1