Unverified Commit ef6dc6c8 authored by Florian's avatar Florian Committed by GitHub
Browse files

Influxdb{2}: fix build with Rust1.83 compat (#368122)

parents ec49f73a fc4e2d36

pkgs/servers/nosql/influxdb/default.nix

+10 −1
Original line number Diff line number Diff line
@@ -34,7 +34,14 @@ let 
        hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";

      })

      ../influxdb2/fix-unsigned-char.patch

      # https://github.com/influxdata/flux/pull/5516

      ../influxdb2/rust_lifetime.patch

    ];

    # Don't fail on missing code documentation

    postPatch = ''

      substituteInPlace flux-core/src/lib.rs \

        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"

    '';

    sourceRoot = "${src.name}/libflux";

    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";

    nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -95,7 +102,9 @@ buildGoModule rec { 


  excludedPackages = "test";



  passthru.tests = { inherit (nixosTests) influxdb; };

  passthru.tests = {

    inherit (nixosTests) influxdb;

  };



  meta = with lib; {

    description = "Open-source distributed time series database";

pkgs/servers/nosql/influxdb2/default.nix

+10 −2
Original line number Diff line number Diff line
@@ -50,7 +50,14 @@ let 
        hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";

      })

      ./fix-unsigned-char.patch

      # https://github.com/influxdata/flux/pull/5516

      ./rust_lifetime.patch

    ];

    # Don't fail on missing code documentation

    postPatch = ''

      substituteInPlace flux-core/src/lib.rs \

        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"

    '';

    sourceRoot = "${src.name}/libflux";

    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";

    nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -74,7 +81,6 @@ let 
        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib

      '';

  };



in

buildGoModule {

  pname = "influxdb";
@@ -132,7 +138,9 @@ buildGoModule { 
    "-X main.version=${version}"

  ];



  passthru.tests = { inherit (nixosTests) influxdb2; };

  passthru.tests = {

    inherit (nixosTests) influxdb2;

  };



  meta = with lib; {

    description = "Open-source distributed time series database";

pkgs/servers/nosql/influxdb2/rust_lifetime.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
diff --git a/flux-core/src/ast/walk/mod.rs b/flux-core/src/ast/walk/mod.rs

index 90f70ba6f7..a6966827e8 100644

--- a/flux-core/src/ast/walk/mod.rs

+++ b/flux-core/src/ast/walk/mod.rs

@@ -180,7 +180,7 @@ impl<'a> Node<'a> {

 

 impl<'a> Node<'a> {

     #[allow(missing_docs)]

-    pub fn from_expr(expr: &'a Expression) -> Node {

+    pub fn from_expr(expr: &'a Expression) -> Node<'a> {

         match expr {

             Expression::Identifier(e) => Node::Identifier(e),

             Expression::Array(e) => Node::ArrayExpr(e),

diff --git a/flux-core/src/parser/mod.rs b/flux-core/src/parser/mod.rs

index ac7d4b9a72..561c3a0ff6 100644

--- a/flux-core/src/parser/mod.rs

+++ b/flux-core/src/parser/mod.rs

@@ -41,7 +41,7 @@ pub struct Parser<'input> {

 

 impl<'input> Parser<'input> {

     /// Instantiates a new parser with the given string as input.

-    pub fn new(src: &'input str) -> Parser {

+    pub fn new(src: &'input str) -> Parser<'input> {

         let s = Scanner::new(src);

         Parser {

             s,