From 31443d21eed5986d8b2968951e3e38283008b892 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 11 Aug 2022 19:10:23 +0300
Subject: [PATCH] chore(tvix): move nix-store CLI scaffolding to subfolder

For some reason a top-level Rust project ended up in this location,
which is incompatible with the actual project structure that's being
prepared for merge right now.

Change-Id: I9d919ad72fc7e4e4d8cbb9899e7f8d90fa7ca87a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6060
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
---
 tvix/{ => nix_cli}/Cargo.lock           | 16 ++++++++--------
 tvix/{ => nix_cli}/Cargo.toml           |  2 +-
 tvix/{ => nix_cli}/default.nix          |  0
 tvix/{ => nix_cli}/shell.nix            |  0
 tvix/{ => nix_cli}/src/bin/nix-store.rs |  0
 tvix/{ => nix_cli}/src/main.rs          |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename tvix/{ => nix_cli}/Cargo.lock (99%)
 rename tvix/{ => nix_cli}/Cargo.toml (93%)
 rename tvix/{ => nix_cli}/default.nix (100%)
 rename tvix/{ => nix_cli}/shell.nix (100%)
 rename tvix/{ => nix_cli}/src/bin/nix-store.rs (100%)
 rename tvix/{ => nix_cli}/src/main.rs (100%)

diff --git a/tvix/Cargo.lock b/tvix/nix_cli/Cargo.lock
similarity index 99%
rename from tvix/Cargo.lock
rename to tvix/nix_cli/Cargo.lock
index 15d97837e..668ab9d5b 100644
--- a/tvix/Cargo.lock
+++ b/tvix/nix_cli/Cargo.lock
@@ -94,6 +94,14 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
+[[package]]
+name = "nix-cli"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "tempfile",
+]
+
 [[package]]
 name = "os_str_bytes"
 version = "6.0.0"
@@ -202,14 +210,6 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
 
-[[package]]
-name = "tvix"
-version = "0.1.0"
-dependencies = [
- "clap",
- "tempfile",
-]
-
 [[package]]
 name = "wasi"
 version = "0.10.2+wasi-snapshot-preview1"
diff --git a/tvix/Cargo.toml b/tvix/nix_cli/Cargo.toml
similarity index 93%
rename from tvix/Cargo.toml
rename to tvix/nix_cli/Cargo.toml
index 8b0fbd846..b1d1d339b 100644
--- a/tvix/Cargo.toml
+++ b/tvix/nix_cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "tvix"
+name = "nix-cli"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/tvix/default.nix b/tvix/nix_cli/default.nix
similarity index 100%
rename from tvix/default.nix
rename to tvix/nix_cli/default.nix
diff --git a/tvix/shell.nix b/tvix/nix_cli/shell.nix
similarity index 100%
rename from tvix/shell.nix
rename to tvix/nix_cli/shell.nix
diff --git a/tvix/src/bin/nix-store.rs b/tvix/nix_cli/src/bin/nix-store.rs
similarity index 100%
rename from tvix/src/bin/nix-store.rs
rename to tvix/nix_cli/src/bin/nix-store.rs
diff --git a/tvix/src/main.rs b/tvix/nix_cli/src/main.rs
similarity index 100%
rename from tvix/src/main.rs
rename to tvix/nix_cli/src/main.rs