mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/store): drop separate bin package

Browse source 
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:
Florian Klink 2023-03-14 22:36:10 +01:00 committed by flokli
parent 0094a1442a
commit 36bed4ce57
5 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/Cargo.lock generated
View file

@ -2640,7 +2640,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "tvix-store-bin" name = "tvix-store"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",

23
tvix/Cargo.nix
View file

@ -93,10 +93,10 @@ rec {
# File a bug if you depend on any for non-debug work! # File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; }; debug = internal.debugCrate { inherit packageId; };
}; };
"tvix-store-bin" = rec { "tvix-store" = rec {
packageId = "tvix-store-bin"; packageId = "tvix-store";
build = internal.buildRustCrateWithFeatures { build = internal.buildRustCrateWithFeatures {
packageId = "tvix-store-bin"; packageId = "tvix-store";
}; };
# Debug support which might change between releases. # Debug support which might change between releases.
@ -7625,10 +7625,6 @@ rec {
name = "dirs"; name = "dirs";
packageId = "dirs"; packageId = "dirs";
} }
{
name = "lazy_static";
packageId = "lazy_static";
}
{ {
name = "nix-compat"; name = "nix-compat";
packageId = "nix-compat"; packageId = "nix-compat";
@ -7637,10 +7633,6 @@ rec {
name = "rustyline"; name = "rustyline";
packageId = "rustyline"; packageId = "rustyline";
} }
{
name = "serde_json";
packageId = "serde_json";
}
{ {
name = "smol_str"; name = "smol_str";
packageId = "smol_str"; packageId = "smol_str";
@ -7649,10 +7641,6 @@ rec {
name = "ssri"; name = "ssri";
packageId = "ssri"; packageId = "ssri";
} }
{
name = "tempfile";
packageId = "tempfile";
}
{ {
name = "thiserror"; name = "thiserror";
packageId = "thiserror"; packageId = "thiserror";
@ -7860,8 +7848,8 @@ rec {
]; ];
}; };
"tvix-store-bin" = rec { "tvix-store" = rec {
crateName = "tvix-store-bin"; crateName = "tvix-store";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2021";
crateBin = [ crateBin = [
@ -7877,7 +7865,6 @@ rec {
if (lib.versionOlder builtins.nixVersion "2.4pre20211007") if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
then lib.cleanSourceWith { filter = sourceFilter; src = ./store; } then lib.cleanSourceWith { filter = sourceFilter; src = ./store; }
else ./store; else ./store;
libName = "tvix_store";
dependencies = [ dependencies = [
{ {
name = "anyhow"; name = "anyhow";

5
tvix/default.nix
View file

@ -34,11 +34,6 @@ in
PROTO_ROOT = depot.tvix.store.protos; PROTO_ROOT = depot.tvix.store.protos;
nativeBuildInputs = protobufDep prev; nativeBuildInputs = protobufDep prev;
}; };
tvix-store-bin = prev: {
PROTO_ROOT = depot.tvix.store.protos;
nativeBuildInputs = protobufDep prev;
};
}; };
}; };

5
tvix/store/Cargo.toml
View file

@ -1,11 +1,8 @@
[package] [package]
name = "tvix-store-bin" name = "tvix-store"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
[lib]
name = "tvix_store"
[dependencies] [dependencies]
anyhow = "1.0.68" anyhow = "1.0.68"
blake3 = { version = "1.3.1", features = ["rayon", "std"] } blake3 = { version = "1.3.1", features = ["rayon", "std"] }

2
tvix/store/default.nix
View file

@ -1,5 +1,5 @@
{ depot, ... }: { depot, ... }:
depot.tvix.crates.workspaceMembers.tvix-store-bin.build.override { depot.tvix.crates.workspaceMembers.tvix-store.build.override {
runTests = true; runTests = true;
} }