chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update influxdb2 patch

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-09-10 14:08:40 +02:00
parent a26ee025de
commit 598f046cb4
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
patches/254383.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix 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 --- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@ -39,7 +39,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644
}; };
flux = rustPlatform.buildRustPackage { flux = rustPlatform.buildRustPackage {
@@ -38,10 +36,20 @@ let @@ -38,10 +36,21 @@ let
owner = "influxdata"; owner = "influxdata";
repo = "flux"; repo = "flux";
rev = "v${libflux_version}"; rev = "v${libflux_version}";
@ -55,6 +55,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644
+ excludes = [ "rust-toolchain.toml" ]; + excludes = [ "rust-toolchain.toml" ];
+ hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg="; + hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg=";
+ }) + })
+ ./no-deny-warnings.patch
+ ]; + ];
sourceRoot = "${src.name}/libflux"; sourceRoot = "${src.name}/libflux";
- cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw="; - cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw=";
@ -62,7 +63,7 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644
nativeBuildInputs = [ rustPlatform.bindgenHook ]; nativeBuildInputs = [ rustPlatform.bindgenHook ];
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;
pkgcfg = '' pkgcfg = ''
@@ -69,7 +77,7 @@ in buildGoModule { @@ -69,7 +78,7 @@ in buildGoModule {
nativeBuildInputs = [ go-bindata pkg-config perl ]; nativeBuildInputs = [ go-bindata pkg-config perl ];
@ -71,3 +72,19 @@ index 6a78aa70ee60d..4bfd89465a6d9 100644
subPackages = [ "cmd/influxd" "cmd/telemetryd" ]; subPackages = [ "cmd/influxd" "cmd/telemetryd" ];
PKG_CONFIG_PATH = "${flux}/pkgconfig"; 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;