From 059780b4f1cec55fa5038f0623120cedeeb94d23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jul 2024 15:25:25 +0000
Subject: [PATCH 1/3] fluent-bit: 3.1.0 -> 3.1.3

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 6d5d7147cbd6..49e2c6f8d35c 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "3.1.0";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X97Z/1GBooQNH6SLH5AG6uX7BkCXCIkdh9vEE4IkUEA=";
+    hash = "sha256-bRgRpCnMt20JEuKqW5VetW8HyMgjNuqEgoeBG7sm++Y=";
   };
 
   # optional only to avoid linux rebuild

From 361b07ae16acc40bcf3ab7b0173ad2113373bcf1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 21:04:58 +0200
Subject: [PATCH 2/3] fluent-bit: reformat

---
 pkgs/tools/misc/fluent-bit/default.nix | 54 +++++++++++++++++---------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 49e2c6f8d35c..cc0370de6858 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, flex
-, bison
-, systemd
-, postgresql
-, openssl
-, libyaml
-, darwin
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  flex,
+  bison,
+  systemd,
+  postgresql,
+  openssl,
+  libyaml,
+  darwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,19 +26,30 @@ stdenv.mkDerivation (finalAttrs: {
   # optional only to avoid linux rebuild
   patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ];
 
-  nativeBuildInputs = [ cmake flex bison ];
+  nativeBuildInputs = [
+    cmake
+    flex
+    bison
+  ];
 
-  buildInputs = [ openssl libyaml postgresql ]
+  buildInputs =
+    [
+      openssl
+      libyaml
+      postgresql
+    ]
     ++ lib.optionals stdenv.isLinux [ systemd ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ];
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.IOKit
+      darwin.apple_sdk_11_0.frameworks.Foundation
+    ];
 
   cmakeFlags = [
     "-DFLB_RELEASE=ON"
     "-DFLB_METRICS=ON"
     "-DFLB_HTTP_SERVER=ON"
     "-DFLB_OUT_PGSQL=ON"
-  ]
-  ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ];
+  ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     # Used by the embedded luajit, but is not predefined on older mac SDKs.
@@ -47,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ]
   );
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   postPatch = ''
     substituteInPlace src/CMakeLists.txt \
@@ -59,7 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Log forwarder and processor, part of Fluentd ecosystem";
     homepage = "https://fluentbit.io";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.samrose lib.maintainers.fpletz ];
+    maintainers = with lib.maintainers; [
+      samrose
+      fpletz
+    ];
     platforms = lib.platforms.unix;
   };
 })

From 436548a5b5bc44f296a24ead04e8d5692a62ff49 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 21:06:53 +0200
Subject: [PATCH 3/3] fluent-bit: move to by-name

---
 .../misc => by-name/fl}/fluent-bit/macos-11-sdk-compat.patch    | 0
 .../default.nix => by-name/fl/fluent-bit/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{tools/misc => by-name/fl}/fluent-bit/macos-11-sdk-compat.patch (100%)
 rename pkgs/{tools/misc/fluent-bit/default.nix => by-name/fl/fluent-bit/package.nix} (100%)

diff --git a/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch b/pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch
similarity index 100%
rename from pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch
rename to pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/by-name/fl/fluent-bit/package.nix
similarity index 100%
rename from pkgs/tools/misc/fluent-bit/default.nix
rename to pkgs/by-name/fl/fluent-bit/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2a18fff0194..331a71a2fce2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7830,8 +7830,6 @@ with pkgs;
     icu = icu63;
   };
 
-  fluent-bit = darwin.apple_sdk_11_0.callPackage ../tools/misc/fluent-bit { };
-
   fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { };
 
   flux = callPackage ../development/compilers/flux { };