From ceb2c0ba895554c7cabb0ac20d3a80ea2aba1ab1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 2 Jan 2023 14:37:08 +0100
Subject: chore(tvix/store): make importable

This allows other crates to import tvix_store.

Rename the bin crate to tvix-store-bin, to avoid having multiple crates
with the same name (https://github.com/rust-lang/cargo/issues/6313)

Change-Id: I857768d6115640dbf102e79ed03e8474090df2fe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7728
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 tvix/Cargo.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tvix/Cargo.nix')

diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 361a0a3ee0..d96632e053 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -103,10 +103,10 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "tvix-store" = rec {
-      packageId = "tvix-store";
+    "tvix-store-bin" = rec {
+      packageId = "tvix-store-bin";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "tvix-store";
+        packageId = "tvix-store-bin";
       };
 
       # Debug support which might change between releases.
@@ -6641,13 +6641,13 @@ rec {
         ];
 
       };
-      "tvix-store" = rec {
-        crateName = "tvix-store";
+      "tvix-store-bin" = rec {
+        crateName = "tvix-store-bin";
         version = "0.1.0";
         edition = "2021";
         crateBin = [
           {
-            name = "tvix-store";
+            name = "tvix-store-bin";
             path = "src/main.rs";
             requiredFeatures = [ ];
           }
@@ -6658,6 +6658,7 @@ rec {
           if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
           then lib.cleanSourceWith { filter = sourceFilter; src = ./store; }
           else ./store;
+        libName = "tvix_store";
         dependencies = [
           {
             name = "anyhow";
-- 
cgit 1.4.1