From 361c26316479e7c130af9fbaf37f9dddf97b738b Mon Sep 17 00:00:00 2001 From: samrose Date: Fri, 3 May 2019 14:46:53 -0400 Subject: [PATCH 1/2] fluent-bit: init at 1.0.6 --- pkgs/tools/misc/fluent-bit/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/fluent-bit/default.nix diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix new file mode 100644 index 000000000000..6d24f3a44735 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "fluent-bit"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "fluent"; + repo = "fluent-bit"; + rev = "8cc3a1887c3fcd6dd95a4a475fb213a0e399c222"; + sha256 = "0rmdbrhhrim80d0hwbz56d5f8rypm6h62ks3xnr0b4w987w10653"; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace /lib/systemd $out/lib/systemd + ''; + + meta = with stdenv.lib; { + description = "Log forwarder and processor, part of Fluentd ecosystem"; + homepage = "https://fluentbit.io"; + maintainers = with maintainers; [ + samrose + ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 647e32175912..267930a10aff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2885,6 +2885,10 @@ in fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fluent-bit = callPackage ../tools/misc/fluent-bit { + stdenv = gccStdenv; + }; + fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; From e42889bbfe44c58d97dc3ca2e09abdc05e44805b Mon Sep 17 00:00:00 2001 From: samrose Date: Tue, 21 May 2019 11:02:16 -0400 Subject: [PATCH 2/2] maintainers: add samrose --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f8fb9bad2f2..c5bf37c7e5d7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4382,6 +4382,11 @@ github = "samdroid-apps"; name = "Sam Parkinson"; }; + samrose = { + email = "samuel.rose@gmail.com"; + github = "samrose"; + name = "Sam Rose"; + }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr";