From 201859ea188a976abba64ce17a27a702ec50657c Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 13 Dec 2015 16:53:07 +0000 Subject: [PATCH] fail2ban: update python-systemd dependency The python module has been split off from systemd since v223. --- pkgs/tools/security/fail2ban/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 33638e5f494..a0451ea63a3 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, python, pythonPackages, unzip, systemd, gamin }: +{ stdenv, fetchzip, python, pythonPackages, unzip, gamin }: let version = "0.9.1"; in @@ -14,8 +14,8 @@ pythonPackages.buildPythonPackage { buildInputs = [ unzip ]; - pythonPath = (stdenv.lib.optional stdenv.isLinux systemd) - ++ [ python.modules.sqlite3 gamin ]; + propagatedBuildInputs = [ python.modules.sqlite3 gamin ] + ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd); preConfigure = '' for i in fail2ban-client fail2ban-regex fail2ban-server; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e109024a199..e47ce53832e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1432,11 +1432,7 @@ let fabric = pythonPackages.fabric; - fail2ban = callPackage ../tools/security/fail2ban { - systemd = systemd.override { - pythonSupport = true; - }; - }; + fail2ban = callPackage ../tools/security/fail2ban { }; fakeroot = callPackage ../tools/system/fakeroot { };