nix: Return to building with crane#21292
Conversation
cla-bot
bot
added
the
cla-signed
|
Someone on linux should check if this builds for them as well as someone on macOS, just to double check |
WeetHet
changed the title
|
I'm out of town for a bit, so I can't test this builds for a couple weeks! |
|
Thanks! Works for me again locally. Since the Nix build is not officially used, I think it's fine to merge this. |
This removes .envrc, putting it into gitignore as well as building with crane, as it does not require an up to date hash for a FOD. Release Notes: - N/A cc @mrnugget @jaredramirez
|
I got around to trying this and I'm hitting this error when building the flake: I searched the repo for this hash and I see it in If I go to the Someone else in the |
|
@jaredramirez I'm running into that too, it appears regular (also, I'd like to ask how exactly is building for nix supposed to work,,,i naïvely just |
pinging per pr #21550: @mgsloan @SomeoneToIgnore @mikayla-maki |
|
maybe pinging everyone is a bit much lol 😭 i did manage to get it building in the end (diff), but not with
then the usual (not exactly sure this is how it should be, i think the i'm sure someone could probably adapt the i do think #17458 is a good idea though, so something like this doesn't happen again, and maybe nix instructions could be added to |
Also renamed the repo to `livekit-rustk-sdks` on GitHub for clarity. The old name will still work for old references. See [discussion here](#21292 (comment)). The only changes in the target repo are immaterial: ``` $ git diff 799f10133d93ba2a88642cd480d01ec4da53408c 060964da10574cd9bf06463a53bf6e0769c5c45e diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index 43f5496..19181c2 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -3837,7 +3837,7 @@ pub struct SendDataRequest { #[prost(string, optional, tag="5")] pub topic: ::core::option::Option<::prost::alloc::string::String>, } - +/// #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SendDataResponse { diff --git a/livekit-runtime/Cargo.toml b/livekit-runtime/Cargo.toml index 4d83cdf..7051f30 100644 --- a/livekit-runtime/Cargo.toml +++ b/livekit-runtime/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" repository = "https://github.com/livekit/rust-sdks" [features] +tokio = ["dep:tokio", "dep:tokio-stream"] async = ["dep:async-std", "dep:futures", "dep:async-io"] dispatcher = ["dep:futures", "dep:async-io", "dep:async-std", "dep:async-task"] ```
|
Hey y'all sorry for the delay in looking into the commit SHA thing. Not sure how that happened, but I've updated the SHA in cargo.toml to now point at our |
Also renamed the repo to `livekit-rustk-sdks` on GitHub for clarity. The old name will still work for old references. See [discussion here](#21292 (comment)). The only changes in the target repo are immaterial: ``` $ git diff 799f10133d93ba2a88642cd480d01ec4da53408c 060964da10574cd9bf06463a53bf6e0769c5c45e diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index 43f5496..19181c2 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -3837,7 +3837,7 @@ pub struct SendDataRequest { #[prost(string, optional, tag="5")] pub topic: ::core::option::Option<::prost::alloc::string::String>, } - +/// #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SendDataResponse { diff --git a/livekit-runtime/Cargo.toml b/livekit-runtime/Cargo.toml index 4d83cdf..7051f30 100644 --- a/livekit-runtime/Cargo.toml +++ b/livekit-runtime/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" repository = "https://github.com/livekit/rust-sdks" [features] +tokio = ["dep:tokio", "dep:tokio-stream"] async = ["dep:async-std", "dep:futures", "dep:async-io"] dispatcher = ["dep:futures", "dep:async-io", "dep:async-std", "dep:async-task"] ``` Release Notes: - N/A
…#22478) Also renamed the repo to `livekit-rustk-sdks` on GitHub for clarity. The old name will still work for old references. See [discussion here](zed-industries#21292 (comment)). The only changes in the target repo are immaterial: ``` $ git diff 799f10133d93ba2a88642cd480d01ec4da53408c 060964da10574cd9bf06463a53bf6e0769c5c45e diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index 43f5496..19181c2 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -3837,7 +3837,7 @@ pub struct SendDataRequest { #[prost(string, optional, tag="5")] pub topic: ::core::option::Option<::prost::alloc::string::String>, } - +/// #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SendDataResponse { diff --git a/livekit-runtime/Cargo.toml b/livekit-runtime/Cargo.toml index 4d83cdf..7051f30 100644 --- a/livekit-runtime/Cargo.toml +++ b/livekit-runtime/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" repository = "https://github.com/livekit/rust-sdks" [features] +tokio = ["dep:tokio", "dep:tokio-stream"] async = ["dep:async-std", "dep:futures", "dep:async-io"] dispatcher = ["dep:futures", "dep:async-io", "dep:async-std", "dep:async-task"] ``` Release Notes: - N/A
6 participants
This removes .envrc, putting it into gitignore as well as building with crane, as it does not require an up to date hash for a FOD.
Release Notes:
cc @mrnugget @jaredramirez