Unverified Commit 98b63514 authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

Merge pull request #261862 from vifino/syslog-ng-4.4.0 

syslogng: Late cleanup
parents eaa49cde 1916a0cb

nixos/modules/services/logging/syslog-ng.nix

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ in { 
      configHeader = mkOption {

        type = types.lines;

        default = ''

          @version: 3.6

          @version: 4.4

          @include "scl.conf"

        '';

        description = lib.mdDoc ''

pkgs/tools/system/syslog-ng/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
}:

let

  python-deps = ps: with ps; [

    pip

    boto3

    botocore

    cachetools
@@ -56,7 +55,7 @@ let 
    websocket-client

    ply

  ];

  myPy3 = (python3.withPackages python-deps);

  py = python3.withPackages python-deps;

in

stdenv.mkDerivation rec {

  pname = "syslog-ng";
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec { 
    rev = "syslog-ng-${version}";

    hash = "sha256-NXwd4dyPfnHO3yjl3GPAMQYqenfpp7xFOil2G1e66w4=";

  };

  nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl myPy3 ];

  nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl ];



  buildInputs = [

    libcap
@@ -76,7 +75,7 @@ stdenv.mkDerivation rec { 
    openssl

    eventlog

    glib

    myPy3

    py

    systemd

    riemann_c_client

    protobufc
@@ -100,7 +99,7 @@ stdenv.mkDerivation rec { 
    "--enable-dynamic-linking"

    "--enable-systemd"

    "--enable-smtp"

    "--with-python-packages=system"

    "--with-python-packages=none"

    "--with-hiredis=system"

    "--with-ivykis=system"

    "--with-librabbitmq-client=system"