diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-03T12·23+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-10-05T06·17+0000 |
| commit | 8239f32b62c4363377f0c513dbcd76dd1e50d01e (patch) | |
| tree | 412a3d3b900e90bdafe85087223636c68bfcd753 | |
| parent | c18ff1a270d3e5ce6c63110fb2cef78a79ad43ef (diff) | |
refactor(tvix/nar-bridge): mv nar-bridge{,-http} r/6703
Rename the nar-bridge CLI to nar-bridge-http, because it's the one spinning up an http server. Change-Id: I0fb75c50e4299272a128dd5ecaa4be8f06fa3dbe Reviewed-on: https://cl.tvl.fyi/c/depot/+/9538 Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
| -rw-r--r-- | tvix/boot/README.md | 4 | ||||
| -rw-r--r-- | tvix/nar-bridge/.gitignore | 2 | ||||
| -rw-r--r-- | tvix/nar-bridge/cmd/nar-bridge-http/main.go (renamed from tvix/nar-bridge/cmd/nar-bridge/main.go) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tvix/boot/README.md b/tvix/boot/README.md index cf593dcc07ba..13a485506079 100644 --- a/tvix/boot/README.md +++ b/tvix/boot/README.md @@ -43,9 +43,9 @@ Potentially copy some data into tvix-store (via nar-bridge): ``` mg run //tvix:store -- daemon & -mg run //tvix:nar-bridge -- & +$(mg build //tvix:nar-bridge)/bin/nar-bridge-http & rm -Rf ~/.cache/nix; nix copy --to http://localhost:9000\?compression\=none $(mg build //third_party/nixpkgs:hello) -pkill nar-bridge; pkill tvix-store +pkill nar-bridge-http; pkill tvix-store ``` #### Interactive shell diff --git a/tvix/nar-bridge/.gitignore b/tvix/nar-bridge/.gitignore index 04260dbc58e5..867be7a1273f 100644 --- a/tvix/nar-bridge/.gitignore +++ b/tvix/nar-bridge/.gitignore @@ -1 +1 @@ -/nar_bridge +/nar-bridge-http diff --git a/tvix/nar-bridge/cmd/nar-bridge/main.go b/tvix/nar-bridge/cmd/nar-bridge-http/main.go index d86e84b870c4..39892d37feac 100644 --- a/tvix/nar-bridge/cmd/nar-bridge/main.go +++ b/tvix/nar-bridge/cmd/nar-bridge-http/main.go @@ -55,7 +55,7 @@ func main() { 30, ) - log.Printf("Starting nar-bridge at %v", cli.ListenAddr) + log.Printf("Starting nar-bridge-http at %v", cli.ListenAddr) go s.ListenAndServe(cli.ListenAddr) // listen for the interrupt signal. |