From e70f51fa141b70457668e1cec76a0db2e4b0624e Mon Sep 17 00:00:00 2001
From: bobvanderlinden <6375609+bobvanderlinden@users.noreply.github.com>
Date: Thu, 14 May 2026 23:47:28 +0000
Subject: [PATCH 1/2] Update Ruby versions

---
 ruby/versions.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruby/versions.json b/ruby/versions.json
index 6a6695b..93e8447 100644
--- a/ruby/versions.json
+++ b/ruby/versions.json
@@ -987,14 +987,18 @@
     "4.0.3": {
       "url": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.gz",
       "sha256": "77964acc370d5c8375b9502e5ba6c13c03ef91ab9eb9f521c84fb42b9c9a6b0f"
+    },
+    "4.0.4": {
+      "url": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.gz",
+      "sha256": "f35f6edfa3dabb3f723f9d0cf1906c6512ae77f4e412ab1e68cc6e91d230fa80"
     }
   },
   "aliases": {
     "2": "2.7.8",
     "3": "3.4.9",
-    "4": "4.0.3",
-    "latest": "4.0.3",
-    "4.0": "4.0.3",
+    "4": "4.0.4",
+    "latest": "4.0.4",
+    "4.0": "4.0.4",
     "3.4": "3.4.9",
     "3.3": "3.3.10",
     "3.2": "3.2.10",
@@ -1009,8 +1013,8 @@
     "2.1": "2.1.10",
     "2.*": "2.7.8",
     "3.*": "3.4.9",
-    "4.*": "4.0.3",
-    "4.0.*": "4.0.3",
+    "4.*": "4.0.4",
+    "4.0.*": "4.0.4",
     "3.4.*": "3.4.9",
     "3.3.*": "3.3.10",
     "3.2.*": "3.2.10",

From 1b4bde35a8071e73393d9975b345874533d7721c Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 15 May 2026 01:44:38 +0200
Subject: [PATCH 2/2] Set LANG for ruby 4.0.4+ support (#230)

This is adapted from the ruby 4.0.4 bump in nixpkgs which also sets
LANG[1] because some non-US-ASCII characters were added that RDoc fails
to parse otherwise.

[1] https://github.com/NixOS/nixpkgs/pull/519212
---
 ruby/package-fn.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruby/package-fn.nix b/ruby/package-fn.nix
index 9f07b8c..4bbf119 100644
--- a/ruby/package-fn.nix
+++ b/ruby/package-fn.nix
@@ -67,6 +67,12 @@ let
     # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
     NROFF = if docSupport then "${groff}/bin/nroff" else null;
 
+    LANG =
+      if docSupport && (with versionComparison version; hasPrefix "4.0") then
+        "C.UTF-8"
+      else
+        null;
+
     nativeBuildInputs = [
       bison
     ] ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.ruby ];