diff options
-rw-r--r-- | nixos/modules/services/networking/nsd.nix | 58 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/oasis/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/dns/nsd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/beets/alternatives-plugin.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/beets/copyartifacts-plugin.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 4 |
6 files changed, 70 insertions, 13 deletions
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 333a3378c4cc..6af1dd736431 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -71,6 +71,7 @@ let # interfaces ${forEach " ip-address: " cfg.interfaces} + ip-freebind: ${yesOrNo cfg.ipFreebind} hide-version: ${yesOrNo cfg.hideVersion} identity: "${cfg.identity}" ip-transparent: ${yesOrNo cfg.ipTransparent} @@ -84,7 +85,7 @@ let reuseport: ${yesOrNo cfg.reuseport} round-robin: ${yesOrNo cfg.roundRobin} server-count: ${toString cfg.serverCount} - ${if cfg.statistics == null then "" else "statistics: ${toString cfg.statistics}"} + ${maybeToString "statistics: " cfg.statistics} tcp-count: ${toString cfg.tcpCount} tcp-query-count: ${toString cfg.tcpQueryCount} tcp-timeout: ${toString cfg.tcpTimeout} @@ -117,7 +118,8 @@ let ''; yesOrNo = b: if b then "yes" else "no"; - maybeString = pre: s: if s == null then "" else ''${pre} "${s}"''; + maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"''; + maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; @@ -146,6 +148,11 @@ let ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} + ${maybeToString "max-refresh-time: " zone.maxRefreshSecs} + ${maybeToString "min-refresh-time: " zone.minRefreshSecs} + ${maybeToString "max-retry-time: " zone.maxRetrySecs} + ${maybeToString "min-retry-time: " zone.minRetrySecs} + allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback} ${forEach " allow-notify: " zone.allowNotify} ${forEach " request-xfr: " zone.requestXFR} @@ -241,6 +248,44 @@ let ''; }; + maxRefreshSecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit refresh time for secondary zones. This is the timer which + checks to see if the zone has to be refetched when it expires. + Normally the value from the SOA record is used, but this option + restricts that value. + ''; + }; + + minRefreshSecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit refresh time for secondary zones. + ''; + }; + + maxRetrySecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit retry time for secondary zones. This is the timeout after + a failed fetch attempt for the zone. Normally the value from + the SOA record is used, but this option restricts that value. + ''; + }; + + minRetrySecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit retry time for secondary zones. + ''; + }; + + notify = mkOption { type = types.listOf types.str; default = []; @@ -366,6 +411,15 @@ in ''; }; + ipFreebind = mkOption { + type = types.bool; + default = false; + description = '' + Whether to bind to nonlocal addresses and interfaces that are down. + Similar to ip-transparent. + ''; + }; + ipTransparent = mkOption { type = types.bool; default = false; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 9b69b3bb016f..eb6cd35b2561 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,11 +1,14 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: -stdenv.mkDerivation { - name = "ocaml-oasis-0.4.7"; +stdenv.mkDerivation rec { + version = "0.4.7"; + name = "ocaml-oasis-${version}"; + # You must manually update the url, not just the version. OCamlforge keys off + # the number after download.php, not the filename. src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1635/oasis-0.4.6.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1635/oasis-${version}.tar.gz"; sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l"; }; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 48dd535382da..368f95b3a183 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.9"; + name = "nsd-4.1.12"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1wn8jm5kpp81m88c77j97850mnmd87yaw8qp3xsdwcakcd6j44dq"; + sha256 = "fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 75f74e71be52..273b5d94c9fc 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index d3b36d15e03e..fa00d64f673f 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "beets-copyartifacts"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 73ad23a6e664..283a6d48ca26 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -107,10 +107,10 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }) ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { - inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ |