pyrox.dev / nixpkgs
lol
fork atom

rerun: 0.13.0 -> 0.18.2 (#334854)

authored by Someone and committed by GitHub cd16cb59 13721304

+481 -57
unified split
-31
pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch
··· 1 - From f6c5dde13a39bd149d892162e2ef72267f4c4a57 Mon Sep 17 00:00:00 2001 2 - From: Someone Serge <sergei.kozlukov@aalto.fi> 3 - Date: Thu, 15 Feb 2024 18:05:16 +0000 4 - Subject: [PATCH] re_space_view_time_series: utils: patch out doctests w 5 - unstable features 6 - 7 - --- 8 - crates/re_space_view_time_series/src/util.rs | 7 +------ 9 - 1 file changed, 1 insertion(+), 6 deletions(-) 10 - 11 - diff --git a/crates/re_space_view_time_series/src/util.rs b/crates/re_space_view_time_series/src/util.rs 12 - index 83ce5362f..59d3b9734 100644 13 - --- a/crates/re_space_view_time_series/src/util.rs 14 - +++ b/crates/re_space_view_time_series/src/util.rs 15 - @@ -288,12 +288,7 @@ fn add_series_runs( 16 - /// is finite `x == x.next_up().next_down()` also holds. 17 - /// 18 - /// ```rust 19 - -/// #![feature(float_next_up_down)] 20 - -/// // f64::EPSILON is the difference between 1.0 and the next number up. 21 - -/// assert_eq!(1.0f64.next_up(), 1.0 + f64::EPSILON); 22 - -/// // But not for most numbers. 23 - -/// assert!(0.1f64.next_up() < 0.1 + f64::EPSILON); 24 - -/// assert_eq!(9007199254740992f64.next_up(), 9007199254740994.0); 25 - +/// // PATCHED OUT THE UNSTABLE float_next_up_down 26 - /// ``` 27 - /// 28 - /// [`NEG_INFINITY`]: f64::NEG_INFINITY 29 - -- 30 - 2.43.0 31 -
+17 -23
pkgs/by-name/re/rerun/package.nix
··· 22 22 23 23 rustPlatform.buildRustPackage rec { 24 24 pname = "rerun"; 25 - version = "0.13.0"; 26 - 25 + version = "0.18.2"; 27 26 src = fetchFromGitHub { 28 27 owner = "rerun-io"; 29 28 repo = "rerun"; 30 29 rev = version; 31 - hash = "sha256-HgzzuvCpzKgWC8it0PSq62hBjjqpdgYtQQ50SNbr3do="; 30 + sha256 = "sha256-mQjjgRKNFSts34Lphfje9H1BLY9nybCrJ2V09nMzVDM="; 32 31 }; 33 - patches = [ 34 - # Disables a doctest that depends on a nightly feature 35 - ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch 36 32 37 - 38 - # "Fix cell size test now that the overhead has shrunk" 39 - # https://github.com/rerun-io/rerun/pull/5917 40 - (fetchpatch { 41 - url = "https://github.com/rerun-io/rerun/commit/933fc5cc1f3ee262a78bd4647257295747671152.patch"; 42 - hash = "sha256-jCeGfzKt0oYqIea+7bA2V/U9VIjhVvfQzLRrYG4jaHY="; 43 - }) 44 - ]; 33 + cargoHash = "sha256-ZyjRe4M6RabSKhKCLa1ed1fsF6dkUt2a1c8C/1E48+M="; 34 + # the crate uses an old rust version (currently 1.76) 35 + # nixpkgs only works with the latest rust (currently 1.80) 36 + # so we patch this 37 + cargoPatches = [ ./rust-version.patch ]; 45 38 46 - cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0="; 39 + cargoBuildFlags = [ "--package rerun-cli" ]; 40 + cargoTestFlags = [ "--package rerun-cli" ]; 41 + buildNoDefaultFeatures = true; 42 + buildFeatures = [ "native_viewer" ]; 47 43 48 44 nativeBuildInputs = [ 49 45 (lib.getBin binaryen) # wasm-opt ··· 105 101 106 102 postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; 107 103 108 - cargoTestFlags = [ 109 - "-p" 110 - "rerun" 111 - "--workspace" 112 - "--exclude=crates/rerun/src/lib.rs" 113 - ]; 114 - 104 + # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work 105 + patches = [ ./tests.patch ]; 115 106 passthru.tests = { 116 107 inherit (python3Packages) rerun-sdk; 117 108 }; ··· 124 115 asl20 125 116 mit 126 117 ]; 127 - maintainers = with maintainers; [ SomeoneSerge ]; 118 + maintainers = with maintainers; [ 119 + SomeoneSerge 120 + robwalt 121 + ]; 128 122 mainProgram = "rerun"; 129 123 }; 130 124 }
+436
pkgs/by-name/re/rerun/rust-version.patch
··· 1 + BUILD.md | 4 ++-- 2 + CHANGELOG.md | 4 ++-- 3 + Cargo.toml | 2 +- 4 + clippy.toml | 2 +- 5 + crates/build/re_build_info/src/build_info.rs | 2 +- 6 + crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md | 2 +- 7 + crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md | 2 +- 8 + docs/content/getting-started/installing-viewer.md | 2 +- 9 + docs/content/getting-started/quick-start/rust.md | 2 +- 10 + examples/rust/clock/Cargo.toml | 2 +- 11 + examples/rust/custom_data_loader/Cargo.toml | 2 +- 12 + examples/rust/custom_space_view/Cargo.toml | 2 +- 13 + examples/rust/custom_store_subscriber/Cargo.toml | 2 +- 14 + examples/rust/dna/Cargo.toml | 2 +- 15 + examples/rust/extend_viewer_ui/Cargo.toml | 2 +- 16 + examples/rust/external_data_loader/Cargo.toml | 2 +- 17 + examples/rust/incremental_logging/Cargo.toml | 2 +- 18 + examples/rust/log_file/Cargo.toml | 2 +- 19 + examples/rust/minimal/Cargo.toml | 2 +- 20 + examples/rust/minimal_options/Cargo.toml | 2 +- 21 + examples/rust/minimal_serve/Cargo.toml | 2 +- 22 + examples/rust/objectron/Cargo.toml | 2 +- 23 + examples/rust/raw_mesh/Cargo.toml | 2 +- 24 + examples/rust/shared_recording/Cargo.toml | 2 +- 25 + examples/rust/spawn_viewer/Cargo.toml | 2 +- 26 + examples/rust/stdio/Cargo.toml | 2 +- 27 + examples/rust/template/Cargo.toml | 2 +- 28 + rust-toolchain | 2 +- 29 + scripts/clippy_wasm/clippy.toml | 2 +- 30 + scripts/lint.py | 2 +- 31 + 30 files changed, 32 insertions(+), 32 deletions(-) 32 + 33 + diff --git a/BUILD.md b/BUILD.md 34 + index c0bc6e074..a74f86967 100644 35 + --- a/BUILD.md 36 + +++ b/BUILD.md 37 + @@ -23,12 +23,12 @@ cd rerun 38 + 39 + Now install the `pixi` package manager: <https://github.com/prefix-dev/pixi?tab=readme-ov-file#installation> 40 + 41 + -Make sure `cargo --version` prints `1.76.0` once you are done. 42 + +Make sure `cargo --version` prints `1.80.0` once you are done. 43 + 44 + If you are using an Apple-silicon Mac (M1, M2), make sure `rustc -vV` outputs `host: aarch64-apple-darwin`. If not, this should fix it: 45 + 46 + ```sh 47 + -rustup set default-host aarch64-apple-darwin && rustup install 1.76.0 48 + +rustup set default-host aarch64-apple-darwin && rustup install 1.80.0 49 + ``` 50 + 51 + ## Building and running the Viewer 52 + diff --git a/CHANGELOG.md b/CHANGELOG.md 53 + index 7efd062ea..82da0d411 100644 54 + --- a/CHANGELOG.md 55 + +++ b/CHANGELOG.md 56 + @@ -672,7 +672,7 @@ As always there's a lot going on under the hood: 57 + - New data APIs 6: cached archetype queries [#5673](https://github.com/rerun-io/rerun/pull/5673) 58 + - Remove justfile & fully replace remaining commands with Pixi [#5892](https://github.com/rerun-io/rerun/pull/5892) 59 + - Replace requirements-docs.txt with a Python doc Pixi environment [#5909](https://github.com/rerun-io/rerun/pull/5909) 60 + -- Update to Rust 1.76 [#5908](https://github.com/rerun-io/rerun/pull/5908) 61 + +- Update to Rust 1.80 [#5908](https://github.com/rerun-io/rerun/pull/5908) 62 + - Remove all dev/ci requirements.txt and fully replace with Pixi [#5939](https://github.com/rerun-io/rerun/pull/5939) 63 + - Markdown linter [#6181](https://github.com/rerun-io/rerun/pull/6181) 64 + 65 + @@ -1337,7 +1337,7 @@ Check out our [migration guide](https://www.rerun.io/docs/reference/migration/mi 66 + 67 + #### 📦 Dependencies 68 + - Update egui and wgpu [#4111](https://github.com/rerun-io/rerun/pull/4111) 69 + -- Update Rust to 1.76.0 [#4390](https://github.com/rerun-io/rerun/pull/4390) 70 + +- Update Rust to 1.80.0 [#4390](https://github.com/rerun-io/rerun/pull/4390) 71 + 72 + #### 🤷 Other 73 + #### 🤷 Other 74 + diff --git a/Cargo.toml b/Cargo.toml 75 + index 48ab565a3..a479a5394 100644 76 + --- a/Cargo.toml 77 + +++ b/Cargo.toml 78 + @@ -24,7 +24,7 @@ homepage = "https://rerun.io" 79 + include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"] 80 + license = "MIT OR Apache-2.0" 81 + repository = "https://github.com/rerun-io/rerun" 82 + -rust-version = "1.76" 83 + +rust-version = "1.80" 84 + version = "0.18.2" 85 + 86 + [workspace.dependencies] 87 + diff --git a/clippy.toml b/clippy.toml 88 + index 70ff980b8..f3d9d04b4 100644 89 + --- a/clippy.toml 90 + +++ b/clippy.toml 91 + @@ -3,7 +3,7 @@ 92 + # ----------------------------------------------------------------------------- 93 + # Section identical to the main scripts/clippy_wasm/clippy.toml: 94 + 95 + -msrv = "1.76" 96 + +msrv = "1.80" 97 + 98 + allow-unwrap-in-tests = true 99 + 100 + diff --git a/crates/build/re_build_info/src/build_info.rs b/crates/build/re_build_info/src/build_info.rs 101 + index 55abb7290..6efb10e3b 100644 102 + --- a/crates/build/re_build_info/src/build_info.rs 103 + +++ b/crates/build/re_build_info/src/build_info.rs 104 + @@ -153,7 +153,7 @@ fn crate_version_from_build_info_string() { 105 + patch: 0, 106 + meta: Some(crate::crate_version::Meta::DevAlpha(7)), 107 + }, 108 + - rustc_version: "1.76.0 (d5c2e9c34 2023-09-13)", 109 + + rustc_version: "1.80.0 (d5c2e9c34 2023-09-13)", 110 + llvm_version: "16.0.5", 111 + git_hash: "", 112 + git_branch: "", 113 + diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md 114 + index 1130ccd7e..c5b748b77 100644 115 + --- a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md 116 + +++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md 117 + @@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: 118 + cargo init cube && cd cube && cargo add rerun --features native_viewer 119 + ``` 120 + 121 + -Note that the Rerun SDK requires a working installation of Rust 1.76+. 122 + +Note that the Rerun SDK requires a working installation of Rust 1.80+. 123 + 124 + ## Logging your own data 125 + 126 + diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md 127 + index fc9cfc1c6..cde772f1a 100644 128 + --- a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md 129 + +++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md 130 + @@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: 131 + cargo init cube && cd cube && cargo add rerun 132 + ``` 133 + 134 + -Note that the Rerun SDK requires a working installation of Rust 1.76+. 135 + +Note that the Rerun SDK requires a working installation of Rust 1.80+. 136 + 137 + ## Logging your own data 138 + 139 + diff --git a/docs/content/getting-started/installing-viewer.md b/docs/content/getting-started/installing-viewer.md 140 + index 8327753b2..55ebc55e8 100644 141 + --- a/docs/content/getting-started/installing-viewer.md 142 + +++ b/docs/content/getting-started/installing-viewer.md 143 + @@ -40,7 +40,7 @@ There are many ways to install the viewer. Please pick whatever works best for y 144 + - Download `rerun-cli` for your platform from the [GitHub Release artifacts](https://github.com/rerun-io/rerun/releases/latest/). 145 + - Via Cargo 146 + - `cargo binstall rerun-cli` - download binaries via [`cargo binstall`](https://github.com/cargo-bins/cargo-binstall) 147 + - - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.76+) 148 + + - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.80+) 149 + - Together with the Rerun [Python SDK](./quick-start/python.md): 150 + - `pip3 install rerun-sdk` - download it via pip 151 + - `conda install -c conda-forge rerun-sdk` - download via Conda 152 + diff --git a/docs/content/getting-started/quick-start/rust.md b/docs/content/getting-started/quick-start/rust.md 153 + index 45d1beb1a..c79bc34db 100644 154 + --- a/docs/content/getting-started/quick-start/rust.md 155 + +++ b/docs/content/getting-started/quick-start/rust.md 156 + @@ -5,7 +5,7 @@ order: 3 157 + 158 + ## Setup 159 + 160 + -The Rerun SDK for Rust requires a working installation of Rust 1.76+. 161 + +The Rerun SDK for Rust requires a working installation of Rust 1.80+. 162 + 163 + After you have [installed the viewer](../installing-viewer.md#installing-the-viewer) you can simply add [the Rerun crate](https://crates.io/crates/rerun) to your project with `cargo add rerun`. 164 + 165 + diff --git a/examples/rust/clock/Cargo.toml b/examples/rust/clock/Cargo.toml 166 + index ba2999675..7c038ebc4 100644 167 + --- a/examples/rust/clock/Cargo.toml 168 + +++ b/examples/rust/clock/Cargo.toml 169 + @@ -2,7 +2,7 @@ 170 + name = "clock" 171 + version = "0.18.2" 172 + edition = "2021" 173 + -rust-version = "1.76" 174 + +rust-version = "1.80" 175 + license = "MIT OR Apache-2.0" 176 + publish = false 177 + 178 + diff --git a/examples/rust/custom_data_loader/Cargo.toml b/examples/rust/custom_data_loader/Cargo.toml 179 + index e5df4cf66..37cbe80cb 100644 180 + --- a/examples/rust/custom_data_loader/Cargo.toml 181 + +++ b/examples/rust/custom_data_loader/Cargo.toml 182 + @@ -2,7 +2,7 @@ 183 + name = "custom_data_loader" 184 + version = "0.18.2" 185 + edition = "2021" 186 + -rust-version = "1.76" 187 + +rust-version = "1.80" 188 + license = "MIT OR Apache-2.0" 189 + publish = false 190 + 191 + diff --git a/examples/rust/custom_space_view/Cargo.toml b/examples/rust/custom_space_view/Cargo.toml 192 + index ae1babd40..5c012cf7c 100644 193 + --- a/examples/rust/custom_space_view/Cargo.toml 194 + +++ b/examples/rust/custom_space_view/Cargo.toml 195 + @@ -2,7 +2,7 @@ 196 + name = "custom_space_view" 197 + version = "0.18.2" 198 + edition = "2021" 199 + -rust-version = "1.76" 200 + +rust-version = "1.80" 201 + license = "MIT OR Apache-2.0" 202 + publish = false 203 + 204 + diff --git a/examples/rust/custom_store_subscriber/Cargo.toml b/examples/rust/custom_store_subscriber/Cargo.toml 205 + index 627f21d7b..52d8d923e 100644 206 + --- a/examples/rust/custom_store_subscriber/Cargo.toml 207 + +++ b/examples/rust/custom_store_subscriber/Cargo.toml 208 + @@ -2,7 +2,7 @@ 209 + name = "custom_store_subscriber" 210 + version = "0.18.2" 211 + edition = "2021" 212 + -rust-version = "1.76" 213 + +rust-version = "1.80" 214 + license = "MIT OR Apache-2.0" 215 + publish = false 216 + 217 + diff --git a/examples/rust/dna/Cargo.toml b/examples/rust/dna/Cargo.toml 218 + index 57909e2fe..f5332a40c 100644 219 + --- a/examples/rust/dna/Cargo.toml 220 + +++ b/examples/rust/dna/Cargo.toml 221 + @@ -2,7 +2,7 @@ 222 + name = "dna" 223 + version = "0.18.2" 224 + edition = "2021" 225 + -rust-version = "1.76" 226 + +rust-version = "1.80" 227 + license = "MIT OR Apache-2.0" 228 + publish = false 229 + 230 + diff --git a/examples/rust/extend_viewer_ui/Cargo.toml b/examples/rust/extend_viewer_ui/Cargo.toml 231 + index 0a753fe36..e2442a638 100644 232 + --- a/examples/rust/extend_viewer_ui/Cargo.toml 233 + +++ b/examples/rust/extend_viewer_ui/Cargo.toml 234 + @@ -2,7 +2,7 @@ 235 + name = "extend_viewer_ui" 236 + version = "0.18.2" 237 + edition = "2021" 238 + -rust-version = "1.76" 239 + +rust-version = "1.80" 240 + license = "MIT OR Apache-2.0" 241 + publish = false 242 + 243 + diff --git a/examples/rust/external_data_loader/Cargo.toml b/examples/rust/external_data_loader/Cargo.toml 244 + index a57a27743..7ee67583d 100644 245 + --- a/examples/rust/external_data_loader/Cargo.toml 246 + +++ b/examples/rust/external_data_loader/Cargo.toml 247 + @@ -2,7 +2,7 @@ 248 + name = "rerun-loader-rust-file" 249 + version = "0.18.2" 250 + edition = "2021" 251 + -rust-version = "1.76" 252 + +rust-version = "1.80" 253 + license = "MIT OR Apache-2.0" 254 + publish = false 255 + 256 + diff --git a/examples/rust/incremental_logging/Cargo.toml b/examples/rust/incremental_logging/Cargo.toml 257 + index c7cfe3965..2bc68c06c 100644 258 + --- a/examples/rust/incremental_logging/Cargo.toml 259 + +++ b/examples/rust/incremental_logging/Cargo.toml 260 + @@ -2,7 +2,7 @@ 261 + name = "incremental_logging" 262 + version = "0.18.2" 263 + edition = "2021" 264 + -rust-version = "1.76" 265 + +rust-version = "1.80" 266 + license = "MIT OR Apache-2.0" 267 + publish = false 268 + 269 + diff --git a/examples/rust/log_file/Cargo.toml b/examples/rust/log_file/Cargo.toml 270 + index 4f3b5a220..b78f3a49b 100644 271 + --- a/examples/rust/log_file/Cargo.toml 272 + +++ b/examples/rust/log_file/Cargo.toml 273 + @@ -2,7 +2,7 @@ 274 + name = "log_file" 275 + version = "0.18.2" 276 + edition = "2021" 277 + -rust-version = "1.76" 278 + +rust-version = "1.80" 279 + license = "MIT OR Apache-2.0" 280 + publish = false 281 + 282 + diff --git a/examples/rust/minimal/Cargo.toml b/examples/rust/minimal/Cargo.toml 283 + index 77588cfb0..f5bc05637 100644 284 + --- a/examples/rust/minimal/Cargo.toml 285 + +++ b/examples/rust/minimal/Cargo.toml 286 + @@ -2,7 +2,7 @@ 287 + name = "minimal" 288 + version = "0.18.2" 289 + edition = "2021" 290 + -rust-version = "1.76" 291 + +rust-version = "1.80" 292 + license = "MIT OR Apache-2.0" 293 + publish = false 294 + 295 + diff --git a/examples/rust/minimal_options/Cargo.toml b/examples/rust/minimal_options/Cargo.toml 296 + index 2f34f4890..6c9afe8c8 100644 297 + --- a/examples/rust/minimal_options/Cargo.toml 298 + +++ b/examples/rust/minimal_options/Cargo.toml 299 + @@ -2,7 +2,7 @@ 300 + name = "minimal_options" 301 + version = "0.18.2" 302 + edition = "2021" 303 + -rust-version = "1.76" 304 + +rust-version = "1.80" 305 + license = "MIT OR Apache-2.0" 306 + publish = false 307 + 308 + diff --git a/examples/rust/minimal_serve/Cargo.toml b/examples/rust/minimal_serve/Cargo.toml 309 + index d2efcb718..7ca9ca96a 100644 310 + --- a/examples/rust/minimal_serve/Cargo.toml 311 + +++ b/examples/rust/minimal_serve/Cargo.toml 312 + @@ -2,7 +2,7 @@ 313 + name = "minimal_serve" 314 + version = "0.18.2" 315 + edition = "2021" 316 + -rust-version = "1.76" 317 + +rust-version = "1.80" 318 + license = "MIT OR Apache-2.0" 319 + publish = false 320 + 321 + diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml 322 + index 25d732cde..bf1029d56 100644 323 + --- a/examples/rust/objectron/Cargo.toml 324 + +++ b/examples/rust/objectron/Cargo.toml 325 + @@ -2,7 +2,7 @@ 326 + name = "objectron" 327 + version = "0.18.2" 328 + edition = "2021" 329 + -rust-version = "1.76" 330 + +rust-version = "1.80" 331 + license = "MIT OR Apache-2.0" 332 + publish = false 333 + 334 + diff --git a/examples/rust/raw_mesh/Cargo.toml b/examples/rust/raw_mesh/Cargo.toml 335 + index a41df4804..a3d3b7081 100644 336 + --- a/examples/rust/raw_mesh/Cargo.toml 337 + +++ b/examples/rust/raw_mesh/Cargo.toml 338 + @@ -2,7 +2,7 @@ 339 + name = "raw_mesh" 340 + version = "0.18.2" 341 + edition = "2021" 342 + -rust-version = "1.76" 343 + +rust-version = "1.80" 344 + license = "MIT OR Apache-2.0" 345 + publish = false 346 + 347 + diff --git a/examples/rust/shared_recording/Cargo.toml b/examples/rust/shared_recording/Cargo.toml 348 + index ded88fbfb..a238033d3 100644 349 + --- a/examples/rust/shared_recording/Cargo.toml 350 + +++ b/examples/rust/shared_recording/Cargo.toml 351 + @@ -2,7 +2,7 @@ 352 + name = "shared_recording" 353 + version = "0.18.2" 354 + edition = "2021" 355 + -rust-version = "1.76" 356 + +rust-version = "1.80" 357 + license = "MIT OR Apache-2.0" 358 + publish = false 359 + 360 + diff --git a/examples/rust/spawn_viewer/Cargo.toml b/examples/rust/spawn_viewer/Cargo.toml 361 + index 8a73efc91..7495735d8 100644 362 + --- a/examples/rust/spawn_viewer/Cargo.toml 363 + +++ b/examples/rust/spawn_viewer/Cargo.toml 364 + @@ -2,7 +2,7 @@ 365 + name = "spawn_viewer" 366 + version = "0.18.2" 367 + edition = "2021" 368 + -rust-version = "1.76" 369 + +rust-version = "1.80" 370 + license = "MIT OR Apache-2.0" 371 + publish = false 372 + 373 + diff --git a/examples/rust/stdio/Cargo.toml b/examples/rust/stdio/Cargo.toml 374 + index f55cea217..78493677e 100644 375 + --- a/examples/rust/stdio/Cargo.toml 376 + +++ b/examples/rust/stdio/Cargo.toml 377 + @@ -2,7 +2,7 @@ 378 + name = "stdio" 379 + version = "0.18.2" 380 + edition = "2021" 381 + -rust-version = "1.76" 382 + +rust-version = "1.80" 383 + license = "MIT OR Apache-2.0" 384 + publish = false 385 + 386 + diff --git a/examples/rust/template/Cargo.toml b/examples/rust/template/Cargo.toml 387 + index 6e1ebafe4..eda133daa 100644 388 + --- a/examples/rust/template/Cargo.toml 389 + +++ b/examples/rust/template/Cargo.toml 390 + @@ -2,7 +2,7 @@ 391 + name = "template" 392 + version = "0.18.2" 393 + edition = "2021" 394 + -rust-version = "1.76" 395 + +rust-version = "1.80" 396 + license = "MIT OR Apache-2.0" 397 + publish = false 398 + 399 + diff --git a/rust-toolchain b/rust-toolchain 400 + index 871f56248..38e5e90f3 100644 401 + --- a/rust-toolchain 402 + +++ b/rust-toolchain 403 + @@ -5,6 +5,6 @@ 404 + # to the user in the error, instead of "error: invalid channel name '[toolchain]'". 405 + 406 + [toolchain] 407 + -channel = "1.76.0" 408 + +channel = "1.80.0" 409 + components = ["rustfmt", "clippy"] 410 + targets = ["wasm32-unknown-unknown"] 411 + diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml 412 + index 75729af1e..627a3650e 100644 413 + --- a/scripts/clippy_wasm/clippy.toml 414 + +++ b/scripts/clippy_wasm/clippy.toml 415 + @@ -6,7 +6,7 @@ 416 + # ----------------------------------------------------------------------------- 417 + # Section identical to the main clippy.toml: 418 + 419 + -msrv = "1.76" 420 + +msrv = "1.80" 421 + 422 + allow-unwrap-in-tests = true 423 + 424 + diff --git a/scripts/lint.py b/scripts/lint.py 425 + index 695d12b6b..32a2c41e1 100755 426 + --- a/scripts/lint.py 427 + +++ b/scripts/lint.py 428 + @@ -599,7 +599,7 @@ def test_lint_workspace_deps() -> None: 429 + name = "clock" 430 + version = "0.6.0-alpha.0" 431 + edition = "2021" 432 + - rust-version = "1.76" 433 + + rust-version = "1.80" 434 + license = "MIT OR Apache-2.0" 435 + publish = false 436 +
+16
pkgs/by-name/re/rerun/tests.patch
··· 1 + rerun_py/build.rs | 2 +- 2 + 1 file changed, 1 insertion(+), 1 deletion(-) 3 + 4 + diff --git a/rerun_py/build.rs b/rerun_py/build.rs 5 + index 3d292c55b..28e54f06b 100644 6 + --- a/rerun_py/build.rs 7 + +++ b/rerun_py/build.rs 8 + @@ -17,7 +17,7 @@ fn main() { 9 + #[cfg(not(target_os = "windows"))] 10 + let rerun_bin = std::env::current_dir() 11 + .expect("std::env::current_dir() failed") 12 + - .join("rerun_sdk/rerun_cli/rerun"); 13 + + .join("rerun_sdk/rerun"); 14 + 15 + if !rerun_bin.exists() { 16 + eprintln!("ERROR: Expected to find `rerun` at `{rerun_bin:?}`.");
+12 -3
pkgs/development/python-modules/rerun-sdk/default.nix
··· 14 14 pytestCheckHook, 15 15 python, 16 16 libiconv, 17 + semver, 18 + opencv4, 17 19 }: 18 20 19 21 buildPythonPackage { 20 22 pname = "rerun-sdk"; 21 - inherit (rerun) version; 22 23 pyproject = true; 23 24 24 - inherit (rerun) src; 25 - inherit (rerun) cargoDeps; 25 + inherit (rerun) 26 + src 27 + version 28 + cargoDeps 29 + cargoPatches 30 + patches 31 + ; 26 32 27 33 nativeBuildInputs = [ 28 34 rustPlatform.cargoSetupHook 29 35 rustPlatform.maturinBuildHook 36 + rerun 30 37 ]; 31 38 32 39 buildInputs = ··· 44 51 pillow 45 52 pyarrow 46 53 typing-extensions 54 + semver 55 + opencv4 47 56 ]; 48 57 49 58 buildAndTestSubdir = "rerun_py";