From 43f437088ce2834eab4441b25b7bcde8796466ff Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 2 Jun 2023 00:08:45 +0800
Subject: [PATCH 1/2] pdns: 4.7.4 -> 4.8.0

Changelog: https://doc.powerdns.com/authoritative/changelog/4.8.html#change-4.8.0
Upgrade Notes: https://doc.powerdns.com/authoritative/upgrading.html#any-version-to-4-8-x
---
 pkgs/servers/dns/pdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix
index 79d4144c82b0..1863d33d19b3 100644
--- a/pkgs/servers/dns/pdns/default.nix
+++ b/pkgs/servers/dns/pdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdns";
-  version = "4.7.4";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    hash = "sha256-dGndgft98RGX9JY4+knO/5+XMiX8j5xxYLC/wAoudHE=";
+    hash = "sha256-YalruviwykmpIloiVLlEPE/44FDTN0N9ha9N6InhASc=";
   };
   # redact configure flags from version output to reduce closure size
   patches = [ ./version.patch ];

From c0bf0c54202828f08cec4ce293945cca7a4c9bb1 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 2 Jun 2023 10:18:05 +0800
Subject: [PATCH 2/2] pdns: use finalAttrs pattern and reformat

---
 pkgs/servers/dns/pdns/default.nix | 51 +++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix
index 1863d33d19b3..b41e4df5242a 100644
--- a/pkgs/servers/dns/pdns/default.nix
+++ b/pkgs/servers/dns/pdns/default.nix
@@ -1,14 +1,32 @@
-{ lib, stdenv, fetchurl, pkg-config, nixosTests
-, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd
-, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, nixosTests
+, boost
+, yaml-cpp
+, libsodium
+, sqlite
+, protobuf
+, openssl
+, systemd
+, mariadb-connector-c
+, postgresql
+, lua
+, openldap
+, geoip
+, curl
+, unixODBC
+, lmdb
+, tinycdb
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pdns";
   version = "4.8.0";
 
   src = fetchurl {
-    url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
+    url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
     hash = "sha256-YalruviwykmpIloiVLlEPE/44FDTN0N9ha9N6InhASc=";
   };
   # redact configure flags from version output to reduce closure size
@@ -16,13 +34,28 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
-    yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb
+    boost
+    mariadb-connector-c
+    postgresql
+    lua
+    openldap
+    sqlite
+    protobuf
+    geoip
+    yaml-cpp
+    libsodium
+    curl
+    unixODBC
+    openssl
+    systemd
+    lmdb
+    tinycdb
   ];
 
   # Configure phase requires 64-bit time_t even on 32-bit platforms.
   env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.is32bit [
-    "-D_TIME_BITS=64" "-D_FILE_OFFSET_BITS=64"
+    "-D_TIME_BITS=64"
+    "-D_FILE_OFFSET_BITS=64"
   ]);
 
   configureFlags = [
@@ -61,4 +94,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ mic92 disassembler nickcao ];
   };
-}
+})