From 775d1c06c32da00a188671dd0e6eac7ab5c32009 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:53:28 +0800
Subject: [PATCH 1/3] tradcpp: 0.5.2 -> 0.5.3

---
 pkgs/by-name/tr/tradcpp/aarch64.patch | 12 ------------
 pkgs/by-name/tr/tradcpp/package.nix   | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/by-name/tr/tradcpp/aarch64.patch

diff --git a/pkgs/by-name/tr/tradcpp/aarch64.patch b/pkgs/by-name/tr/tradcpp/aarch64.patch
deleted file mode 100644
index ef7ad9828ace..000000000000
--- a/pkgs/by-name/tr/tradcpp/aarch64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/config.h b/config.h
---- a/config.h
-+++ b/config.h
-@@ -124,6 +124,8 @@
- #define CONFIG_CPU "__ppc64__"
- #elif defined(__ARM__)
- #define CONFIG_CPU "__ARM__"
-+#elif defined(__aarch64__)
-+#define CONFIG_CPU "__aarch64__"
- #else
- /* let it go */
- #endif
diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix
index bba9e0501e90..f3bbd64eec14 100644
--- a/pkgs/by-name/tr/tradcpp/package.nix
+++ b/pkgs/by-name/tr/tradcpp/package.nix
@@ -2,26 +2,24 @@
   lib,
   stdenv,
   fetchurl,
-  autoconf,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tradcpp";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchurl {
-    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz";
-    sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc";
+    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${version}.tar.gz";
+    hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4=";
   };
 
-  strictDeps = true;
   # tradcpp only comes with BSD-make Makefile; the patch adds configure support
-  nativeBuildInputs = [ autoconf ];
-  preConfigure = "autoconf";
-  patches = [
-    ./tradcpp-configure.patch
-    ./aarch64.patch
-  ];
+  patches = [ ./tradcpp-configure.patch ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = with lib; {
     description = "Traditional (K&R-style) C macro preprocessor";

From 29df84dada573e306eb797b5fbf6b554064cefc1 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:54:30 +0800
Subject: [PATCH 2/3] tradcpp: use finalAttrs

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

diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix
index f3bbd64eec14..b9a4fea05586 100644
--- a/pkgs/by-name/tr/tradcpp/package.nix
+++ b/pkgs/by-name/tr/tradcpp/package.nix
@@ -5,12 +5,12 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tradcpp";
   version = "0.5.3";
 
   src = fetchurl {
-    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${version}.tar.gz";
+    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${finalAttrs.version}.tar.gz";
     hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4=";
   };
 
@@ -27,5 +27,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     license = licenses.bsd2;
   };
-
-}
+})

From ab8dc3437df350bebb20d524ac762b46c6ad1950 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:55:02 +0800
Subject: [PATCH 3/3] tradcpp: remove with lib

---
 pkgs/by-name/tr/tradcpp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix
index b9a4fea05586..e7afc2c7675b 100644
--- a/pkgs/by-name/tr/tradcpp/package.nix
+++ b/pkgs/by-name/tr/tradcpp/package.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Traditional (K&R-style) C macro preprocessor";
     mainProgram = "tradcpp";
-    platforms = platforms.all;
-    license = licenses.bsd2;
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2;
   };
 })