Skip to content

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

Merged
gador merged 2 commits intoNixOS:masterfrom
gador:influxdb-rust1.83
Dec 27, 2024
Merged

Influxdb{2}: fix build with Rust1.83 compat#368122
gador merged 2 commits intoNixOS:masterfrom
gador:influxdb-rust1.83

Conversation

@gador
Copy link
Member

@gador gador commented Dec 25, 2024

Fix current build issue (https://hydra.nixos.org/build/281927328/nixlog/3):

   Compiling flux-core v0.154.0 (/build/source/libflux/flux-core)
error: elided lifetime has a name
   --> flux-core/src/ast/walk/mod.rs:183:47
    |
181 | impl<'a> Node<'a> {
    |      -- lifetime `'a` declared here
182 |     #[allow(missing_docs)]
183 |     pub fn from_expr(expr: &'a Expression) -> Node {
    |                                               ^^^^ this elided lifetime gets resolved as `'a`
    |
note: the lint level is defined here
   --> flux-core/src/lib.rs:1:38
    |
1   | #![cfg_attr(feature = "strict", deny(warnings, missing_docs))]
    |                                      ^^^^^^^^
    = note: `#[deny(elided_named_lifetimes)]` implied by `#[deny(warnings)]`

error: elided lifetime has a name
  --> flux-core/src/parser/mod.rs:44:37
   |
42 | impl<'input> Parser<'input> {
   |      ------ lifetime `'input` declared here
43 |     /// Instantiates a new parser with the given string as input.
44 |     pub fn new(src: &'input str) -> Parser {
   |                                     ^^^^^^ this elided lifetime gets resolved as `'input`

error: could not compile `flux-core` (lib) due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
error: could not compile `flux-core` (lib) due to 2 previous errors

fix from influxdata/flux#5516

Also need to disable errors on missing docs

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 25, 2024
@gador
Copy link
Member Author

gador commented Dec 27, 2024

nixosTests.influxdb2 and nixosTests.influxbd pass, too

@gador gador merged commit ef6dc6c into NixOS:master Dec 27, 2024
25 of 26 checks passed
@girlmaya
Copy link

girlmaya commented Jan 2, 2025

Will this be backported?

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 2, 2025

Successfully created backport PR for release-24.11:

@lucasew
Copy link
Contributor

lucasew commented Jan 2, 2025

I asked the bot to make the PR

@girlmaya
Copy link

girlmaya commented Jan 3, 2025

Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants