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>
This commit is contained in:
parent
0094a1442a
commit
36bed4ce57
5 changed files with 8 additions and 29 deletions
2
tvix/Cargo.lock
generated
2
tvix/Cargo.lock
generated
|
@ -2640,7 +2640,7 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "tvix-store-bin"
|
||||
name = "tvix-store"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -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"] }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ depot, ... }:
|
||||
|
||||
depot.tvix.crates.workspaceMembers.tvix-store-bin.build.override {
|
||||
depot.tvix.crates.workspaceMembers.tvix-store.build.override {
|
||||
runTests = true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue