Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fluent-bit: link against Nix dependencies, fix Darwin builds, and add NixOS module #365493

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

commiterate
Copy link
Contributor

@commiterate commiterate commented Dec 16, 2024

Link against Nix dependencies, fix Darwin builds, and add NixOS module (upstreams commiterate/nix-fluent-bit).

fluent-bit vends its dependencies by keeping a copy of their sources under lib/ in their source tree and building them from source. All of the dependencies their CMake setup can source from the system are already Nix packages (e.g. libbacktrace, luajit).

Darwin builds have also been silently broken for awhile now.

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Dec 16, 2024
@commiterate commiterate force-pushed the init/fluent-bit-module branch from f956bdc to d699387 Compare December 16, 2024 04:41
ci/OWNERS Outdated Show resolved Hide resolved
@commiterate commiterate force-pushed the init/fluent-bit-module branch from d699387 to 3a9ac5a Compare December 16, 2024 04:42
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 16, 2024
@commiterate commiterate force-pushed the init/fluent-bit-module branch 6 times, most recently from 1a806f0 to a77fc83 Compare December 18, 2024 18:08
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin labels Dec 18, 2024
@commiterate commiterate force-pushed the init/fluent-bit-module branch from a77fc83 to 29466a6 Compare December 18, 2024 18:22
@ofborg ofborg bot requested review from fpletz and samrose December 19, 2024 06:46
pkgs/by-name/fl/fluent-bit/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fl/fluent-bit/package.nix Outdated Show resolved Hide resolved
nixos/modules/services/monitoring/fluent-bit.nix Outdated Show resolved Hide resolved
nixos/modules/services/monitoring/fluent-bit.nix Outdated Show resolved Hide resolved
nixos/modules/services/monitoring/fluent-bit.nix Outdated Show resolved Hide resolved
nixos/modules/services/monitoring/fluent-bit.nix Outdated Show resolved Hide resolved
@commiterate commiterate force-pushed the init/fluent-bit-module branch from 43fd7da to 4f31d27 Compare January 1, 2025 20:45
@commiterate commiterate force-pushed the init/fluent-bit-module branch 4 times, most recently from a178dea to 5853cde Compare January 6, 2025 20:13
@h7x4 h7x4 added 8.has: module (new) This PR adds a module in `nixos/` 8.has: tests This PR has tests labels Jan 17, 2025
@commiterate commiterate force-pushed the init/fluent-bit-module branch from 5853cde to 3367011 Compare January 29, 2025 03:08
@commiterate commiterate requested a review from Scrumplex January 30, 2025 22:26
@commiterate commiterate force-pushed the init/fluent-bit-module branch 3 times, most recently from b08c5d4 to 87143f3 Compare February 5, 2025 06:00
@arianvp
Copy link
Member

arianvp commented Feb 5, 2025

I'm gonna give this a test run today and if all good I'm happy to add myself as the maintainer of this.

@commiterate commiterate force-pushed the init/fluent-bit-module branch from 87143f3 to 547792d Compare February 5, 2025 18:42
@commiterate commiterate removed the request for review from samrose February 6, 2025 02:51
@commiterate commiterate force-pushed the init/fluent-bit-module branch from 547792d to 2ee5637 Compare February 6, 2025 07:59
@nix-owners nix-owners bot requested a review from samrose February 6, 2025 08:07
@commiterate commiterate force-pushed the init/fluent-bit-module branch from 2ee5637 to 3fccd0f Compare February 14, 2025 05:21
@commiterate commiterate requested a review from arianvp February 15, 2025 18:59
@commiterate commiterate added 10.rebuild-linux: 1 and removed 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-linux: 1-10 10.rebuild-darwin: 1-10 labels Feb 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: tests This PR has tests 10.rebuild-darwin: 1 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants