From 6e5fcac29b883c9f967006d3e73f755c35588b4f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 10 Apr 2026 08:04:50 +0200
Subject: [PATCH] tclPackages.rl_json: 0.15.7 -> 0.16

---
 .../by-name/rl/rl_json/package.nix            | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
index aefab7d88c6f..dfc56bc68fd1 100644
--- a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
+++ b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
@@ -4,40 +4,30 @@
   fetchFromGitHub,
   autoreconfHook,
   tcl,
+  pandoc,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rl_json";
-  version = "0.15.7";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
     tag = finalAttrs.version;
-    hash = "sha256-6Y6bq/Lm6KCFFV3RF6v4fVPEN1LO+jE2xZV50a8zyng=";
+    hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY=";
     fetchSubmodules = true;
   };
 
-  # The vendored libtommath conflicts with tclTomMath.
-  # Replacing it with tclTomMath fixes the issue.
-  # https://github.com/RubyLane/rl_json/issues/57
-  # The switch to a vendored libtommath was done in 0.15.4 in commit
-  # https://github.com/RubyLane/rl_json/commit/9294d533f4d81288acf53045666b1587cf7fbf92
-  # "for proper bignum handling", but the commit message doesn't explain what's wrong
-  # with tclTomMath's bignum handling and all tests pass anyway.
   postPatch = ''
-    rm -r deps/libtommath
-    substituteInPlace Makefile.in \
-      --replace-fail 'deps: local/lib/libtommath.a' 'deps:'
-    substituteInPlace configure.ac \
-      --replace-fail -ltommath ""
-    substituteInPlace generic/rl_jsonInt.h \
-      --replace-fail '#include <tommath.h>' '#include <tclTomMath.h>'
+    mkdir doc/.build
+    cp doc/json.md.in doc/.build/json.md.in
   '';
 
   nativeBuildInputs = [
     autoreconfHook
     tcl.tclPackageHook
+    pandoc
   ];
 
   configureFlags = [
@@ -47,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     "--datarootdir=${placeholder "out"}/share"
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
   doCheck = true;
 
   meta = {