1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
nixpkgs/pkgs/servers/dns
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
bind Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
coredns treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
dnsdist treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
doh-proxy doh-proxy: 0.0.8 -> 0.0.9 2019-08-17 12:38:55 +02:00
knot-dns treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
knot-resolver treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
nsd nsd: 4.2.0 -> 4.2.1 2019-08-19 16:23:11 -07:00
pdns-recursor treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
powerdns Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00