From bba3bb3237c1891122f4a16e7b4c98c155070005 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 14 Feb 2024 18:09:13 +0100 Subject: [PATCH] pdns-recursor: 4.9.3 -> 5.0.2 https://doc.powerdns.com/recursor/changelog/5.0.html#change-5.0.2 --- pkgs/servers/dns/pdns-recursor/default.nix | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 95dc64156f42..e691336d52a9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,26 +1,46 @@ { lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf +, libsodium +, curl +, rustPlatform, cargo, rustc , enableProtoBuf ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "4.9.3"; + version = "5.0.2"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - hash = "sha256-FmBFMFFJ3s3pWCH3bwabZl9rISLf99RquVLVDZ8B7Us="; + url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; + hash = "sha256-qQ6LYf3BgbWWFEw1kgEYynHDuV9GZYzOfoIidQ3kXKk="; }; - nativeBuildInputs = [ pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; + hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA="; + }; + + cargoRoot = "settings/rust"; + + nativeBuildInputs = [ + cargo + rustc + + rustPlatform.cargoSetupHook + pkg-config + ]; buildInputs = [ boost openssl systemd lua luajit + libsodium + curl ] ++ lib.optional enableProtoBuf protobuf; configureFlags = [ "--enable-reproducible" "--enable-systemd" + "--enable-dns-over-tls" "sysconfdir=/etc/pdns-recursor" ]; @@ -42,4 +62,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; }; -} +})