diff --git a/pkgs/by-name/op/openobserve/build.rs.patch b/pkgs/by-name/op/openobserve/build.rs.patch index 1cfb91c7c12b..70e89ec2c873 100644 --- a/pkgs/by-name/op/openobserve/build.rs.patch +++ b/pkgs/by-name/op/openobserve/build.rs.patch @@ -1,11 +1,11 @@ diff --git a/build.rs b/build.rs index 0f66ace..be74fad 100644 ---- a/build.rs -+++ b/build.rs -@@ -99,24 +99,5 @@ fn main() -> Result<()> { - &["proto"], - )?; - +--- a/src/config/build.rs ++++ b/src/config/build.rs +@@ -20,24 +20,5 @@ use chrono::{DateTime, SecondsFormat, Utc}; + fn main() -> Result<()> { + println!("cargo:rerun-if-changed=build.rs"); + - // build information - let output = Command::new("git") - .args(["describe", "--tags", "--abbrev=0"]) diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix index 6684c7d4f1e9..8472b1700e23 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/by-name/op/openobserve/package.nix @@ -15,12 +15,12 @@ }: let - version = "0.14.0"; + version = "0.14.7"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; tag = "v${version}"; - hash = "sha256-rTp+DkADqYkJg1zJog1yURE082V5kCqgid/oUd81SN8="; + hash = "sha256-+YcVTn/jcEbaqTycMCYn6B0z2HsvgrCY1gHnkRajwSs="; }; web = buildNpmPackage { inherit src version; @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/web"; - npmDepsHash = "sha256-awfQR1wZBX3ggmD0uJE9Fur4voPydeygrviRijKnBTE="; + npmDepsHash = "sha256-1MUmAWkeYUEL6WZGq1Jg5W2uKa2xj0oZbGlIbvZWT1E="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { ''; useFetchCargoVendor = true; - cargoHash = "sha256-FWMUPghx9CxuzP7jFZYSIwZsylApWzQsfx8DuwS4GTo="; + cargoHash = "sha256-vfc6B+Uc8RXQD8vGC1yV9w5YAefkYJMpCH2frqjrSWk="; nativeBuildInputs = [ pkg-config @@ -96,6 +96,7 @@ rustPlatform.buildRustPackage { checkFlags = [ "--skip=handler::http::router::tests::test_get_proxy_routes" "--skip=tests::e2e_test" + "--skip=service::organization::tests::test_organization" ]; passthru.updateScript = gitUpdater {