From 36bed4ce57c4af353b4ae8533bb97574bf3004e8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 14 Mar 2023 22:36:10 +0100
Subject: chore(tvix/store): drop separate bin package

Apparently, having multiple packages with the same path is a bad thing:

```
The bin target `tvix-store` in package `tvix-store-bin v0.1.0 (/home/flokli/tvl/tvix/store)` has the same output filename as the lib target `tvix_store` in package `tvix-store-bin v0.1.0 (/home/flokli/tvl/tvix/store)`.
Colliding filename is: /home/flokli/tvl/tvix/target/doc/tvix_store/index.html
The output filenames should be unique.
This is a known bug where multiple crates with the same name use
the same path; see <https://github.com/rust-lang/cargo/issues/6313>.
```

Change-Id: Ic785c0349070783baf5e8fd23f5fb60603a3c995
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8308
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 tvix/Cargo.lock        |  2 +-
 tvix/Cargo.nix         | 23 +++++------------------
 tvix/default.nix       |  5 -----
 tvix/store/Cargo.toml  |  5 +----
 tvix/store/default.nix |  2 +-
 5 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 278f811ecfa5..8b80c392c06f 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -2640,7 +2640,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "tvix-store-bin"
+name = "tvix-store"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 3dcb716d890c..7dcd3cef5347 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -93,10 +93,10 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "tvix-store-bin" = rec {
-      packageId = "tvix-store-bin";
+    "tvix-store" = rec {
+      packageId = "tvix-store";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "tvix-store-bin";
+        packageId = "tvix-store";
       };
 
       # Debug support which might change between releases.
@@ -7625,10 +7625,6 @@ rec {
             name = "dirs";
             packageId = "dirs";
           }
-          {
-            name = "lazy_static";
-            packageId = "lazy_static";
-          }
           {
             name = "nix-compat";
             packageId = "nix-compat";
@@ -7637,10 +7633,6 @@ rec {
             name = "rustyline";
             packageId = "rustyline";
           }
-          {
-            name = "serde_json";
-            packageId = "serde_json";
-          }
           {
             name = "smol_str";
             packageId = "smol_str";
@@ -7649,10 +7641,6 @@ rec {
             name = "ssri";
             packageId = "ssri";
           }
-          {
-            name = "tempfile";
-            packageId = "tempfile";
-          }
           {
             name = "thiserror";
             packageId = "thiserror";
@@ -7860,8 +7848,8 @@ rec {
         ];
 
       };
-      "tvix-store-bin" = rec {
-        crateName = "tvix-store-bin";
+      "tvix-store" = rec {
+        crateName = "tvix-store";
         version = "0.1.0";
         edition = "2021";
         crateBin = [
@@ -7877,7 +7865,6 @@ rec {
           if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
           then lib.cleanSourceWith { filter = sourceFilter; src = ./store; }
           else ./store;
-        libName = "tvix_store";
         dependencies = [
           {
             name = "anyhow";
diff --git a/tvix/default.nix b/tvix/default.nix
index 1b18b7b3fdf2..f88a7bccd595 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -34,11 +34,6 @@ in
         PROTO_ROOT = depot.tvix.store.protos;
         nativeBuildInputs = protobufDep prev;
       };
-
-      tvix-store-bin = prev: {
-        PROTO_ROOT = depot.tvix.store.protos;
-        nativeBuildInputs = protobufDep prev;
-      };
     };
   };
 
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 793c75a9d84e..569b78076ae1 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -1,11 +1,8 @@
 [package]
-name = "tvix-store-bin"
+name = "tvix-store"
 version = "0.1.0"
 edition = "2021"
 
-[lib]
-name = "tvix_store"
-
 [dependencies]
 anyhow = "1.0.68"
 blake3 = { version = "1.3.1", features = ["rayon", "std"] }
diff --git a/tvix/store/default.nix b/tvix/store/default.nix
index 3d873a097ec4..ec04629ab24b 100644
--- a/tvix/store/default.nix
+++ b/tvix/store/default.nix
@@ -1,5 +1,5 @@
 { depot, ... }:
 
-depot.tvix.crates.workspaceMembers.tvix-store-bin.build.override {
+depot.tvix.crates.workspaceMembers.tvix-store.build.override {
   runTests = true;
 }
-- 
cgit 1.4.1