From ff5e041fdbc43a01d64916ce477404a586787f7f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 11 Nov 2022 22:46:20 +0000
Subject: [PATCH] chore(tvix/store): move castore.proto

This moves the castore.proto file into the //tvix/store/protos directory. Per-
component protos might make more sense, than a "tvix-wide" proto directory.

Change-Id: Ie728210174b041e9285a0e2ac605d715d0f0cbda
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7285
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/proto/LICENSE                         |  2 +-
 tvix/proto/default.nix                     |  1 -
 tvix/store/protos/LICENSE                  | 21 +++++++++++++++++++++
 tvix/{proto => store/protos}/castore.proto |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 tvix/store/protos/LICENSE
 rename tvix/{proto => store/protos}/castore.proto (98%)

diff --git a/tvix/proto/LICENSE b/tvix/proto/LICENSE
index 36878fe4c..2034ada6f 100644
--- a/tvix/proto/LICENSE
+++ b/tvix/proto/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2021 The Tvix Authors
+Copyright © The Tvix Authors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/tvix/proto/default.nix b/tvix/proto/default.nix
index 26673cdf7..35e2eba7f 100644
--- a/tvix/proto/default.nix
+++ b/tvix/proto/default.nix
@@ -5,6 +5,5 @@
 
 pkgs.runCommand "tvix-cc-proto" { } ''
   mkdir $out
-  ${pkgs.protobuf}/bin/protoc -I ${./.} castore.proto --cpp_out=$out
   ${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out
 ''
diff --git a/tvix/store/protos/LICENSE b/tvix/store/protos/LICENSE
new file mode 100644
index 000000000..2034ada6f
--- /dev/null
+++ b/tvix/store/protos/LICENSE
@@ -0,0 +1,21 @@
+Copyright © The Tvix Authors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+“Software”), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/tvix/proto/castore.proto b/tvix/store/protos/castore.proto
similarity index 98%
rename from tvix/proto/castore.proto
rename to tvix/store/protos/castore.proto
index 89cfb82e4..e73160bf9 100644
--- a/tvix/proto/castore.proto
+++ b/tvix/store/protos/castore.proto
@@ -3,7 +3,7 @@
 
 syntax = "proto3";
 
-package tvix.proto.v1;
+package tvix.store.v1;
 
 // A Directory can contain Directory, File or Symlink nodes.
 // Each of these nodes have a name attribute, which is the basename in that directory