diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 278f811ec..8b80c392c 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 3dcb716d8..7dcd3cef5 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 1b18b7b3f..f88a7bccd 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 793c75a9d..569b78076 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 3d873a097..ec04629ab 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; }