JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751bdacc9b
nixpkgs/nixos/modules/services/networking
History
aszlig 751bdacc9b
nixos/nsd: Don't override bind via nixpkgs.config 
When generating values for the services.nsd.zones attribute using values
from pkgs, we'll run into an infinite recursion because the nsd module
has a condition on the top-level definition of nixpkgs.config.

While it would work to push the definition a few levels down, it will
still only work if we don't use bind tools for generating zones.

As far as I could see, Python support for BIND seems to be only needed
for the dnssec-* tools, so instead of using nixpkgs.config, we now
directly override pkgs.bind instead of globally in nixpkgs.

To illustrate the problem with a small test case, instantiating the
following Nix expression from the nixpkgs source root will cause the
mentioned infinite recursion:

  (import ./nixos {
    configuration = { lib, pkgs, ... }: {
      services.nsd.enable = true;
      services.nsd.zones = import (pkgs.writeText "foo.nix" ''
        { "foo.".data = "xyz";
          "foo.".dnssec = true;
        }
      '');
    };
  }).vm

With this change, generating zones via import-from-derivation is now
possible again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @pngwjpgh
2019-01-04 01:49:50 +01:00
..
firefox firefox.syncserver service: Fix missing dependency 2017-12-08 22:18:57 +00:00
hylafax nixos/hylafax: show correct option in warning message. 2018-09-11 10:38:04 +01:00
ircd-hybrid nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
keepalived nixos/keepalived: Implemented vrrp-instance tracking scripts and interfaces. 2018-05-08 11:25:53 +02:00
nghttpx [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
ssh sshd: Add restartTrigger for sshd_config 2019-01-02 20:11:01 +01:00
strongswan-swanctl strongswan-swanctl: adapt options to strongswan-5.7.1 2018-10-26 23:46:02 +02:00
znc nixos/znc: Fix confOptions.uriPrefix not being applied 2018-10-20 20:56:30 +02:00
amuled.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
aria2.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
asterisk.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
atftpd.nix nixos/atftpd: various improvements 2016-10-17 16:20:24 +02:00
autossh.nix nixos: use "example.net" host name in autossh documentation 2015-10-28 20:04:36 +01:00
avahi-daemon.nix nixos/avahi: add support for extraConfig 2018-07-28 12:48:08 +03:00
babeld.nix babeld module: updated example config 2017-11-10 11:54:21 +01:00
bind.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
bird.nix bird: set reloadIfChanged to true (#45924) 2018-09-02 06:51:32 +02:00
bitlbee.nix nixos/bitlbee: use purple-2 as purple_plugin_path (#49440) 2018-10-30 15:37:41 +01:00
btsync.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
charybdis.nix charybdis service: bin/charybdis-ircd -> bin/charybdis 2018-10-07 13:10:50 +02:00
chrony.nix nixos/chrony: fix misplaced ConditionCapability= directive 2018-12-02 20:32:47 -06:00
cjdns.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
cntlm.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
connman.nix connmand: add extraFlags option to service 2018-02-15 23:37:12 +01:00
consul.nix treewide: systemd timeout arguments to use infinity instead of 0 (#50934) 2018-11-25 13:33:22 +01:00
coturn.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
dante.nix dante service: default for logoutput 2018-04-26 13:57:11 +03:00
ddclient.nix Revert "nixos/ddclient: make RuntimeDirectory and configFile private" 2018-12-29 16:53:43 +01:00
dhcpcd.nix nixos/dhcpcd: (try to) restart chrony in the exitHook 2018-11-30 18:50:33 -06:00
dhcpd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
dnscache.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
dnschain.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
dnscrypt-proxy.nix dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039) 2018-05-31 23:15:19 +02:00
dnscrypt-proxy.xml docs: format 2018-09-29 20:51:11 -04:00
dnscrypt-wrapper.nix nixos/dnscrypt-wrapper: fix rotate script failing to restart the service 2018-01-05 02:37:09 +01:00
dnsdist.nix nixos/dnsdist: initial service 2018-05-02 10:30:30 -04:00
dnsmasq.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
ejabberd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
epmd.nix epmd: Introduce erlang port mapper daemon service 2018-07-19 17:32:29 +02:00
eternal-terminal.nix Address more review feedback. 2018-10-24 17:57:33 -07:00
fakeroute.nix fakeroute: add service 2016-11-23 15:23:10 +01:00
ferm.nix nixos/treewide: remove boolean examples for options 2017-03-17 23:36:19 +01:00
fireqos.nix nixos/fireqos: add service 2017-09-09 00:29:46 +02:00
firewall.nix Rename back to default and better release notes 2018-11-22 19:24:23 -05:00
flannel.nix flannel service: fix enable expression 2017-01-22 21:58:39 +01:00
flashpolicyd.nix nixos/flashpolicyd: fix url and use https 2018-11-24 23:13:09 +01:00
freenet.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
freeradius.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
gale.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
gateone.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
gdomap.nix [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
git-daemon.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
gnunet.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
gogoclient.nix
gvpe.nix gpve service: network-interfaces.target -> network.target 2016-09-13 11:19:22 +02:00
hans.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
haproxy.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
heyefi.nix heyefi service: make uploadDir path more generic and a string 2015-07-14 06:56:30 -07:00
hostapd.nix Fix hostapd's place in systemd dependency tree. (#45464) 2018-10-17 09:18:52 +02:00
htpdate.nix nixos: add htpdate module 2016-09-23 02:02:20 +10:00
i2p.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
i2pd.nix nixos/i2pd: Update options to encompass recent additions to the daemon 2018-09-09 18:48:51 +02:00
iodine.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
iperf3.nix nixos/iperf: Init the module 2018-09-06 12:38:30 +02:00
iwd.nix iwd: 0.7 -> 0.8 2018-09-23 15:26:55 +03:00
keybase.nix keybase service: Turn off debug logging 2017-11-03 14:45:08 -04:00
kippo.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
kresd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
lambdabot.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
libreswan.nix nixos/libreswan: add missing runtime dependencies 2017-10-22 15:36:26 +02:00
lldpd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
logmein-hamachi.nix logmein-hamachi: init at 2.1.0.139, add nixos service 2016-04-27 16:15:01 +03:00
mailpile.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
matterbridge.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
minidlna.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
miniupnpd.nix nixos: miniupnpd: use iptables scripts 2018-09-15 23:10:24 +02:00
miredo.nix miredo: Improve service description 2017-05-18 15:57:26 +02:00
mjpg-streamer.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
monero.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
morty.nix [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
mosquitto.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
mstpd.nix nixos/network-interfaces: Add mstpd support for bridges 2015-01-07 14:49:24 -08:00
murmur.nix nixos/murmur: mention mumble in description 2018-10-08 13:33:36 +02:00
mxisd.nix modules: add mxisd with test 2018-11-25 14:24:10 +01:00
namecoind.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
nat.nix nixos/nat: optional networking.nat.externalInterface (#41864) 2018-06-12 15:14:15 +02:00
ndppd.nix ndppd module: init (#35533) 2018-05-05 00:33:20 -05:00
networkmanager.nix nixos/nm-setup-hostsdir: RemainAfterExist -> RemainAfterExit 2018-12-15 08:33:28 +01:00
nftables.nix nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
ngircd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
nix-serve.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
nixops-dns.nix nixos/nixops-dns: init (#34511) 2018-02-20 10:14:55 +00:00
nntp-proxy.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
nsd.nix nixos/nsd: Don't override bind via nixpkgs.config 2019-01-04 01:49:50 +01:00
ntopng.nix types.uniq types.int -> types.int 2015-06-15 18:11:32 +02:00
ntpd.nix nixos/ntp: use upstream default restrictions to avoid DDoS (#50762) 2018-11-28 10:15:25 +00:00
nullidentdmod.nix nixos/nullidentdmod: Init 2018-09-06 16:31:20 +02:00
nylon.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
ocserv.nix ocserv: init at 0.12.1 (#42871) 2018-08-01 21:39:09 +02:00
oidentd.nix oidentd: 2.2.2 -> 2.3.1 2018-11-07 14:51:45 +02:00
openfire.nix openfire service: more informative assertion failure message 2016-12-10 20:35:43 +01:00
openntpd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
openvpn.nix openvpn: document how to import an external config 2018-07-20 10:51:52 +02:00
ostinato.nix ostinato: add ostinato in NixOS services 2016-01-04 14:29:02 +08:00
owamp.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
pdns-recursor.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
pdnsd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
polipo.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
powerdns.nix powerdns: removed PrivateTmp=true in serviceConfig 2016-10-01 12:27:23 -04:00
pptpd.nix nixos: correct improper uses of mkEnableOption, clarify service descriptions 2018-10-05 13:14:45 +07:00
prayer.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
privoxy.nix privoxy service: remove static uid 2016-12-05 13:37:08 +01:00
prosody.nix prosody service: set cafile 2018-12-17 01:01:41 +01:00
quagga.nix quagga module: Use a deep merge via imports instead of the shallow merge 2018-07-05 22:11:29 -04:00
quassel.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
racoon.nix nixos/racoon: create /var/racoon upon start 2015-08-19 23:38:44 +02:00
radicale.nix Revert "nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1" 2018-07-28 00:12:55 +03:00
radvd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
rdnssd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
redsocks.nix redsocks module: add self as maintainer 2018-10-31 01:06:14 +09:00
resilio.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
rpcbind.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
rxe.nix nixos/rdma-core: add module for soft RoCE and test (#34607) 2018-02-10 07:52:03 +00:00
sabnzbd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
searx.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
seeks.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
shadowsocks.nix shadowsocks service: init 2018-04-13 13:39:21 +03:00
shairport-sync.nix shairport-sync service: fix default arguments 2019-01-02 19:17:22 +01:00
shout.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
skydns.nix etcd: make all service using etc go to 127.0.0.1:2379 by default 2016-11-11 23:11:54 +01:00
smokeping.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
sniproxy.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
softether.nix softether module: fix dataDir option 2018-02-22 18:37:59 +03:00
spiped.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
squid.nix squid service: intial service based on default config 2017-09-09 12:44:46 +02:00
sslh.nix nixos/sslh: add transparent proxying support (#41412) 2018-06-09 00:38:51 +02:00
strongswan.nix strongswan module: make it work with ipsec l2tp 2018-02-07 13:21:49 +09:00
stubby.nix Add stubby resolver daemon service module (#38667) 2018-05-16 15:16:30 +02:00
stunnel.nix nixos/stunnel: add module (#33151) 2018-01-21 11:23:07 +00:00
supplicant.nix supplicant: Fix tiny typo in the documentation 2018-07-04 00:14:45 +02:00
supybot.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
syncthing-relay.nix syncthing-relay module: init 2018-11-19 01:09:54 +01:00
syncthing.nix nixos/syncthing: move configuration to condigDir 2018-10-15 20:34:50 +02:00
tcpcrypt.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
teamspeak3.nix teamspeak_server: 3.0.13.6 -> 3.3.0 2018-08-17 00:25:31 +02:00
tftpd.nix nixos/tftpd: change default dir from /home/tftp to /srv/tftp 2016-10-25 17:20:52 +02:00
tinc.nix tinc: remove unnecessary networking.interfaces 2018-10-18 21:37:56 +01:00
tinydns.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
tox-bootstrapd.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
toxvpn.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
tvheadend.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
unbound.nix networkmanager: Expand dns description, integrate with other services (#41898) 2018-06-29 13:41:46 -04:00
unifi.nix nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
vsftpd.nix reewide: Purge all uses stdenv.system and top-level system 2018-08-30 17:20:32 -04:00
wakeonlan.nix Fixed wrong documentation for Wake-On-LAN feature 2015-10-31 12:55:34 +01:00
websockify.nix
wicd.nix wicd: get closer to upstream service definition 2016-09-13 11:19:22 +02:00
wireguard.nix wireguard: don't modprobe if boot.isContainer is set 2018-11-20 01:17:04 +01:00
wpa_supplicant.nix nixos/wireless: add extraConfig section to networking.wireless 2018-08-09 15:20:44 -05:00
xinetd.nix nixos: use types.lines for extraConfig 2016-10-23 19:41:43 +02:00
xl2tpd.nix nixos: correct improper uses of mkEnableOption, clarify service descriptions 2018-10-05 13:14:45 +07:00
xrdp.nix nixos: correct improper uses of mkEnableOption, clarify service descriptions 2018-10-05 13:14:45 +07:00
zerobin.nix [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
zeronet.nix nixos/zeronet: Fix TOR permissions, add torAlways option 2018-09-08 12:12:11 -05:00
zerotierone.nix nixos/zerotier: binds to network-online.target to avoid the 1m30s timeout before kill on shutdown 2018-11-01 23:00:25 +00:00