diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/dns')
8 files changed, 41 insertions, 28 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix index 2afc5da51f57..61ab6f98d21c 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.7"; + version = "9.16.8"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz"; + sha256 = "0ccdbqmpvnxlbrxjsx2w8ir4xh961svzcw7n87n8dglj6rb9r6wy"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch + # Fix cross-compilation (will be included in next release after 9.16.8) + (fetchpatch { + url = "https://gitlab.isc.org/isc-projects/bind9/-/commit/35ca6df07277adff4df7472a0b01ea5438cdf1ff.patch"; + sha256 = "1sj0hcd0wgkam7hrbp2vw2yymmni4azr9ixd9shz1l6ja90bdj9h"; + }) ]; nativeBuildInputs = [ perl pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix index 6b3d35e36389..ff0211d37e7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "0ggkpdlwrmyaicn61qyx4m5svmw7px0gfwl8mhhif8dfmjznfkir"; + sha256 = "04hkz70s5i7ndwyg39za3k83amvmi90rkjm8qp3w3a8fbmq4q4y6"; }; - vendorSha256 = "0fzgqgfmyqfyap0j81ihag0319cq34k3y0a9rxkg9cg23hn1d5gf"; + vendorSha256 = "1zwrf2pshb9r3yvp7mqali47163nqhvs9ghflczfpigqswd1m0p0"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index 3f81ecdf6a9a..61fa164010e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/dnsdist/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "0n3vy84kczvbwbzmr1d2c9lh3im77gz83wczj0im4zs91kpw81rc"; + sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; }; nativeBuildInputs = [ pkgconfig protobuf ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; license = licenses.gpl2; - maintainers = with maintainers; [ das_j ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 61faf3bd4029..9eb3fc4e74c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb"; + sha256 = "f813a5e53263ef51d0415508e1f7d33cfbb75a139ccb10a344ae5a91689933fb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 9f54d2f5fa30..2ec9a6dfdd90 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -2,7 +2,8 @@ # native deps. , runCommand, pkgconfig, meson, ninja, makeWrapper # build+runtime deps. -, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data +, knot-dns, luajitPackages, libuv, gnutls, lmdb +, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -11,16 +12,16 @@ let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals; +inherit (stdenv.lib) optional optionals optionalString; lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.3"; + version = "5.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b"; + sha256 = "8824267ca3331fa06d418c1351b68c648da0af121bcbc84c6e08f5b1e28d9433"; }; outputs = [ "out" "dev" ]; @@ -38,6 +39,11 @@ unwrapped = stdenv.mkDerivation rec { # ExecStart can't be overwritten in overrides. # We need that to use wrapped executable and correct config file. sed '/^ExecStart=/d' -i systemd/kresd@.service.in + '' + # some tests have issues with network sandboxing, apparently + + optionalString doInstallCheck '' + echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua + sed '/^[[:blank:]]*test_dstaddr,$/d' -i tests/config/doh2.test.lua ''; preConfigure = '' @@ -48,8 +54,9 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] - ++ optional stdenv.isLinux systemd # passing sockets, sd_notify - ## optional dependencies; TODO: libedit, dnstap + ++ optionals stdenv.isLinux [ systemd libcap_ng ] + ++ [ nghttp2 ] + ## optional dependencies; TODO: dnstap ; mesonFlags = [ @@ -67,10 +74,12 @@ unwrapped = stdenv.mkDerivation rec { postInstall = '' rm "$out"/lib/libkres.a rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS + '' + optionalString stdenv.targetPlatform.isLinux '' + rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; doInstallCheck = with stdenv; hostPlatform == buildPlatform; - installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx ]; + installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs ''; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/nsd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/nsd/default.nix index 2dfdf108c4fa..35f76943e14c 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v"; + sha256 = "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz"; }; prePatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 3e62d520be94..8257d4ef2525 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.5"; + version = "4.4.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0mggqi4588mg6vpgplk9b4ak6msdf279lxkblv563l2vjiyfmfcc"; + sha256 = "162nczipxnsbgg7clap697yikxjz1vdsjkaxxsn6hb6l6m3a6zzr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-reproducible" - "--with-systemd" + "--enable-systemd" ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/powerdns/default.nix index cacd5b7c54fe..0f9f91ebf861 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/powerdns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/powerdns/default.nix @@ -1,29 +1,28 @@ { stdenv, fetchurl, pkgconfig, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd -, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC +, mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: stdenv.mkDerivation rec { pname = "powerdns"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1vf03hssk9rfhvhzfc5ca2r4ly67wq0czr0ysvdrk8pnb0yk6yfi"; + sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC openssl systemd + libyamlcpp libsodium curl unixODBC openssl systemd ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' configureFlagsArray=( - "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote" + "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua2 pipe random remote" --with-sqlite3 - --with-socketdir=/var/lib/powerdns --with-libcrypto=${openssl.dev} --with-libsodium --enable-tools |