diff options
author | Florian Klink <flokli@flokli.de> | 2023-03-14T21·36+0100 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-03-14T22·23+0000 |
commit | 36bed4ce57c4af353b4ae8533bb97574bf3004e8 (patch) | |
tree | aaf151ce9a78229bee82f96fc100d93958d3e6eb /tvix/Cargo.nix | |
parent | 0094a1442a2c6baed558fd9dedeb778c2129ce6a (diff) |
chore(tvix/store): drop separate bin package r/6007
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>
Diffstat (limited to 'tvix/Cargo.nix')
-rw-r--r-- | tvix/Cargo.nix | 23 |
1 files changed, 5 insertions, 18 deletions
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. @@ -7626,10 +7626,6 @@ rec { packageId = "dirs"; } { - name = "lazy_static"; - packageId = "lazy_static"; - } - { name = "nix-compat"; packageId = "nix-compat"; } @@ -7638,10 +7634,6 @@ rec { packageId = "rustyline"; } { - name = "serde_json"; - packageId = "serde_json"; - } - { name = "smol_str"; packageId = "smol_str"; } @@ -7650,10 +7642,6 @@ rec { 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"; |