diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 10:13:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 10:13:33 +0100 |
| commit | f29000b0023a879b42be2a8bd59136ec0c533b88 (patch) | |
| tree | 4b0b2851c7dec0588d236f6d3946b8018a74afb9 /pkgs/servers/dns | |
| parent | 291eac9d70e5f4b8cbbc7632afcac5ea79eb62ba (diff) | |
| parent | 76c146c99073ad27046a0a28bb3d2881486e32bb (diff) | |
| download | nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.gz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.bz2 nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.lz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.xz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.zst nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1421760
Diffstat (limited to 'pkgs/servers/dns')
| -rw-r--r-- | pkgs/servers/dns/nsd/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 6cf98daab5bf..d14233016d86 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -10,14 +10,16 @@ , rootServer ? false , rrtypes ? false , zoneStats ? false + +, configFile ? "etc/nsd/nsd.conf" }: stdenv.mkDerivation rec { - name = "nsd-4.1.16"; + name = "nsd-4.1.19"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz"; + sha256 = "1i82kvgxv4vz79dqd0ckz6syr1fdf6q60r4b926qh5klnnwjqy5h"; }; prePatch = '' @@ -39,7 +41,15 @@ stdenv.mkDerivation rec { ++ edf rootServer "root-server" ++ edf rrtypes "draft-rrtypes" ++ edf zoneStats "zone-stats" - ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ]; + ++ [ "--with-ssl=${openssl.dev}" + "--with-libevent=${libevent.dev}" + "--with-nsd_conf_file=${configFile}" + "--with-configdir=etc/nsd" + ]; + + patchPhase = '' + sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in + ''; meta = with stdenv.lib; { homepage = http://www.nlnetlabs.nl; |