diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b56c0de69397..0a844693fe3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7644,9 +7644,7 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { - go = go_1_9; - }; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; @@ -12264,7 +12262,10 @@ with pkgs; bftpd = callPackage ../servers/ftp/bftpd {}; - bind = callPackage ../servers/dns/bind { }; + bind = callPackage ../servers/dns/bind { + enablePython = config.bind.enablePython or false; + python3 = python3.withPackages (ps: with ps; [ ply ]); + }; dnsutils = bind.dnsutils; inherit (callPackages ../servers/bird { }) @@ -12946,6 +12947,7 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; + zipkin = callPackage ../servers/monitoring/zipkin { }; ### OS-SPECIFIC |