diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-29 12:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 12:00:57 +0000 |
| commit | 571f1df5e41d4aeab9f36c76ada75968c940b388 (patch) | |
| tree | 460309d4c12f08f3b4ff34dc5389f9dddc84c6c7 /pkgs/tools/system | |
| parent | 72e667204b6dc29bb53ae9a235d0f5a47b81c36b (diff) | |
| parent | 0891a9099b4f6013cbe201d81558f8ad528fa3ef (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 3c387cf28708e..f511323f9e558 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" |