diff options
| author | Adrian Pistol <vifino@posteo.net> | 2023-10-18 17:48:27 +0200 |
|---|---|---|
| committer | Adrian Pistol <vifino@posteo.net> | 2023-10-18 17:51:04 +0200 |
| commit | 1916a0cb9e97592ce22f6c3ca5e1febef1ca162b (patch) | |
| tree | b6bda3804ad79fd680f177914afb7b6ffe6ac9e6 | |
| parent | b0015dc064518e6eba64336182a2b6aae2d53e8c (diff) | |
| download | nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar.gz nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar.bz2 nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar.lz nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar.xz nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.tar.zst nixpkgs-1916a0cb9e97592ce22f6c3ca5e1febef1ca162b.zip | |
syslogng: clean up build
| -rw-r--r-- | nixos/modules/services/logging/syslog-ng.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index d22acbeaa70..48d556b9459 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -67,7 +67,7 @@ in { configHeader = mkOption { type = types.lines; default = '' - @version: 3.6 + @version: 4.4 @include "scl.conf" ''; description = lib.mdDoc '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 3c387cf2870..f511323f9e5 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -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" |