public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixpkgs/bind: use python3

Browse Source
This commit is contained in:
Gregor Kleen 2017-11-17 14:03:30 +01:00
parent 9826f5cc3c
commit a2e40f7254
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/dns/bind/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
, enableSeccomp ? false, libseccomp ? null , enableSeccomp ? false, libseccomp ? null
, enablePython ? false, python ? null }: , enablePython ? false, python3 ? null }:
assert enableSeccomp -> libseccomp != null; assert enableSeccomp -> libseccomp != null;
assert enablePython -> python != null; assert enablePython -> python3 != null;
let version = "9.11.2"; in let version = "9.11.2"; in
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl libtool perl libxml2 ] buildInputs = [ openssl libtool perl libxml2 ]
++ lib.optional enableSeccomp libseccomp ++ lib.optional enableSeccomp libseccomp
++ lib.optional enablePython python; ++ lib.optional enablePython python3;
STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

2
pkgs/top-level/all-packages.nix
View File

@ -11464,7 +11464,7 @@ with pkgs;
bind = callPackage ../servers/dns/bind { bind = callPackage ../servers/dns/bind {
enablePython = config.bind.enablePython or false; enablePython = config.bind.enablePython or false;
python = python.withPackages (ps: with ps; [ ply ]); python3 = python3.withPackages (ps: with ps; [ ply ]);
}; };
dnsutils = bind.dnsutils; dnsutils = bind.dnsutils;