From 7c74092ad1e31bdd1bab14f906852851723f2253 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 11 Apr 2024 19:18:36 +0000 Subject: [PATCH 1/2] rerun: fix the broken test --- pkgs/by-name/re/rerun/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 9c96b86f64c9..b9e547f96d9b 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, + fetchpatch, fetchFromGitHub, pkg-config, stdenv, @@ -32,6 +33,14 @@ rustPlatform.buildRustPackage rec { patches = [ # Disables a doctest that depends on a nightly feature ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch + + + # "Fix cell size test now that the overhead has shrunk" + # https://github.com/rerun-io/rerun/pull/5917 + (fetchpatch { + url = "https://github.com/rerun-io/rerun/commit/933fc5cc1f3ee262a78bd4647257295747671152.patch"; + hash = "sha256-jCeGfzKt0oYqIea+7bA2V/U9VIjhVvfQzLRrYG4jaHY="; + }) ]; cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0="; From d6733d933ddce467d1b1d12e9265eb205c23fcdd Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 11 Apr 2024 19:18:44 +0000 Subject: [PATCH 2/2] rerun: nixfmt --- pkgs/by-name/re/rerun/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index b9e547f96d9b..844f97700c22 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -105,7 +105,7 @@ rustPlatform.buildRustPackage rec { ) ''; - postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; cargoTestFlags = [ "-p"