diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 3ff22223e4d5..1c509784a3a5 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.28.2"; + version = "0.29.0"; outputs = [ "out" @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-4zijWVLXnNQLqEMWnO1o/fnCoBjESDbn14CQyCP2o2s="; + hash = "sha256-15wYH+MhrAaW7MPl7Kkh7u5SzxIGXTj2HkhJGZ38kMo="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-FrOo4+5S8JAlQSmDvH0omhOsG9PjZMvRejk9VHEucVY="; + cargoHash = "sha256-TVsPS1jzDzRSY9b636Tv30WupCnyfADeA+8pYn8STIs="; cargoBuildFlags = [ "--package rerun-cli" diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index d429aaa7e6bb..452c04b67da2 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -36,9 +36,23 @@ buildPythonPackage { src version cargoDeps - postPatch ; + postPatch = + (rerun.postPatch or "") + + # error: failed to parse contents of PYO3_CONFIG_FILE + # + # The pyo3 config file is supposed to be generated beforehand by invoking pixi. + # As the only goal of this file is to enhance build caching, it is not worth bothering with it. + # See https://github.com/rerun-io/rerun/blob/0.29.0/BUILD.md#pythonpyo3-configuration-important + + '' + substituteInPlace .cargo/config.toml \ + --replace-fail \ + "PYO3_CONFIG_FILE" \ + "# PYO3_CONFIG_FILE" + ''; + nativeBuildInputs = [ pkgs.protobuf # for protoc rerun