From 850dedef8444cc2cc6fb02585617a24e669feef0 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 16:22:06 +0800
Subject: [PATCH 1/3] ulogd: 2.0.8 -> 2.0.9

---
 pkgs/by-name/ul/ulogd/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ul/ulogd/package.nix b/pkgs/by-name/ul/ulogd/package.nix
index f08977a88c09..7f4f0a7835bb 100644
--- a/pkgs/by-name/ul/ulogd/package.nix
+++ b/pkgs/by-name/ul/ulogd/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  gnumake,
   libnetfilter_acct,
   libnetfilter_conntrack,
   libnetfilter_log,
@@ -23,12 +22,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.8";
+  version = "2.0.9";
   pname = "ulogd";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
-    hash = "sha256-Tq1sOXDD9X+h6J/i18xIO6b+K9GwhwFSHgs6/WZ98pE=";
+    url = "https://www.netfilter.org/pub/ulogd/ulogd-${version}.tar.xz";
+    hash = "sha256-UjplH+Cp8lsM2H1dNfw32Tgufuz89h5I1VBf88+A7aU=";
   };
 
   outputs = [

From da2bcfcb1f3fdd5b9150400518269ef119a58c4c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 16:25:33 +0800
Subject: [PATCH 2/3] ulogd: use finalAttrs

---
 pkgs/by-name/ul/ulogd/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ul/ulogd/package.nix b/pkgs/by-name/ul/ulogd/package.nix
index 7f4f0a7835bb..66487c556219 100644
--- a/pkgs/by-name/ul/ulogd/package.nix
+++ b/pkgs/by-name/ul/ulogd/package.nix
@@ -21,12 +21,12 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "2.0.9";
   pname = "ulogd";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/pub/ulogd/ulogd-${version}.tar.xz";
+    url = "https://www.netfilter.org/pub/ulogd/ulogd-${finalAttrs.version}.tar.xz";
     hash = "sha256-UjplH+Cp8lsM2H1dNfw32Tgufuz89h5I1VBf88+A7aU=";
   };
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace ulogd.8 --replace "/usr/share/doc" "$doc/share/doc"
+    substituteInPlace ulogd.8 --replace-fail "/usr/share/doc" "$doc/share/doc"
   '';
 
   postBuild = ''
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    install -Dm444 -t $out/share/doc/${pname} ulogd.conf doc/ulogd.txt doc/ulogd.html README doc/*table
-    install -Dm444 -t $out/share/doc/${pname}-mysql doc/mysql*.sql
-    install -Dm444 -t $out/share/doc/${pname}-pgsql doc/pgsql*.sql
+    install -Dm444 -t $out/share/doc/ulogd ulogd.conf doc/ulogd.txt doc/ulogd.html README doc/*table
+    install -Dm444 -t $out/share/doc/ulogd-mysql doc/mysql*.sql
+    install -Dm444 -t $out/share/doc/ulogd-pgsql doc/pgsql*.sql
   '';
 
   buildInputs = [
@@ -98,4 +98,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ p-h ];
   };
-}
+})

From 849f6c5edeb87a46ef229d298fa1010bbbafd32a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 16:26:25 +0800
Subject: [PATCH 3/3] ulogd: remove with lib

---
 pkgs/by-name/ul/ulogd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ul/ulogd/package.nix b/pkgs/by-name/ul/ulogd/package.nix
index 66487c556219..8157163b7c87 100644
--- a/pkgs/by-name/ul/ulogd/package.nix
+++ b/pkgs/by-name/ul/ulogd/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests = { inherit (nixosTests) ulogd; };
 
-  meta = with lib; {
+  meta = {
     description = "Userspace logging daemon for netfilter/iptables";
     mainProgram = "ulogd";
 
@@ -94,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     homepage = "https://www.netfilter.org/projects/ulogd/index.html";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ p-h ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ p-h ];
   };
 })