From 598f046cb41bacaaddaba626161ffecbb35d3b3c Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 10 Sep 2023 14:08:40 +0200 Subject: [PATCH] Update influxdb2 patch --- patches/254383.patch | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/patches/254383.patch b/patches/254383.patch index 3cab819b..51671a75 100644 --- a/patches/254383.patch +++ b/patches/254383.patch @@ -1,5 +1,5 @@ diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix -index 6a78aa70ee60d..4bfd89465a6d9 100644 +index 6a78aa70ee60d3..c103a0f086fc73 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -1,6 +1,7 @@ @@ -39,7 +39,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644 }; flux = rustPlatform.buildRustPackage { -@@ -38,10 +36,20 @@ let +@@ -38,10 +36,21 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; @@ -55,6 +55,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644 + excludes = [ "rust-toolchain.toml" ]; + hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg="; + }) ++ ./no-deny-warnings.patch + ]; sourceRoot = "${src.name}/libflux"; - cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw="; @@ -62,7 +63,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644 nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' -@@ -69,7 +77,7 @@ in buildGoModule { +@@ -69,7 +78,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config perl ]; @@ -71,3 +72,19 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644 subPackages = [ "cmd/influxd" "cmd/telemetryd" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; +diff --git a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch +new file mode 100644 +index 00000000000000..3000ccad8256c5 +--- /dev/null ++++ b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch +@@ -0,0 +1,10 @@ ++diff --git a/flux/src/lib.rs b/flux/src/lib.rs ++index 3fdf4071..a4c02277 100644 ++--- a/flux/src/lib.rs +++++ b/flux/src/lib.rs ++@@ -1,5 +1,3 @@ ++-#![cfg_attr(feature = "strict", deny(warnings, missing_docs))] ++- ++ //! This module provides the public facing API for Flux's Go runtime, including formatting, ++ //! parsing, and standard library analysis. ++ use std::sync::Arc;