contrib/nix: also bump unicode gem for older Rubies

danc86 · danc86 · commit e9f8f8439973 · 2025-04-06T15:07:20.000+10:00
Commit 58d5318 bumped unicode from 0.4.4.4 to 0.4.4.5, to fix a compilation failure with newer clang, but only in Gemfile.lock. Bump it in the older Rubies' pinned lockfiles as well for consistency.
diff --git a/contrib/nix/ruby2.4-Gemfile.lock b/contrib/nix/ruby2.4-Gemfile.lock
@@ -45,7 +45,7 @@ GEM
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
     ruby-progressbar (1.11.0)
-    unicode (0.4.4.4)
+    unicode (0.4.4.5)
     unicode-display_width (2.2.0)
     xapian-ruby (1.4.18)
 
diff --git a/contrib/nix/ruby2.4-gemset.nix b/contrib/nix/ruby2.4-gemset.nix
@@ -301,10 +301,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
+      sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
       type = "gem";
     };
-    version = "0.4.4.4";
+    version = "0.4.4.5";
   };
   unicode-display_width = {
     groups = ["default"];
diff --git a/contrib/nix/ruby2.4-shell.nix b/contrib/nix/ruby2.4-shell.nix
@@ -14,13 +14,6 @@ let
       fiddle = attrs: {
         buildInputs = [ pkgs.libffi ];
       };
-      # Workaround for a new error in clang 16 (MacOS):
-      # https://github.com/blackwinter/unicode/pull/11
-      unicode = attrs: {
-        buildFlags = [
-          "--with-cflags=-Wno-incompatible-function-pointer-types"
-        ];
-      };
       # Workaround: remove rake from nativeBuildInputs, otherwise it causes
       # xapian-bindings to build against the default Ruby version
       # instead of our chosen version.
diff --git a/contrib/nix/ruby2.5-Gemfile.lock b/contrib/nix/ruby2.5-Gemfile.lock
@@ -45,7 +45,7 @@ GEM
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
     ruby-progressbar (1.11.0)
-    unicode (0.4.4.4)
+    unicode (0.4.4.5)
     unicode-display_width (2.2.0)
     xapian-ruby (1.4.18)
 
diff --git a/contrib/nix/ruby2.5-gemset.nix b/contrib/nix/ruby2.5-gemset.nix
@@ -301,10 +301,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
+      sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
       type = "gem";
     };
-    version = "0.4.4.4";
+    version = "0.4.4.5";
   };
   unicode-display_width = {
     groups = ["default"];
diff --git a/contrib/nix/ruby2.5-shell.nix b/contrib/nix/ruby2.5-shell.nix
@@ -14,13 +14,6 @@ let
       fiddle = attrs: {
         buildInputs = [ pkgs.libffi ];
       };
-      # Workaround for a new error in clang 16 (MacOS):
-      # https://github.com/blackwinter/unicode/pull/11
-      unicode = attrs: {
-        buildFlags = [
-          "--with-cflags=-Wno-incompatible-function-pointer-types"
-        ];
-      };
       # Workaround: remove rake from nativeBuildInputs, otherwise it causes
       # xapian-bindings to build against the default Ruby version
       # instead of our chosen version.
diff --git a/contrib/nix/ruby2.6-Gemfile.lock b/contrib/nix/ruby2.6-Gemfile.lock
@@ -47,7 +47,7 @@ GEM
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
     ruby-progressbar (1.11.0)
-    unicode (0.4.4.4)
+    unicode (0.4.4.5)
     unicode-display_width (2.2.0)
     xapian-ruby (1.4.18)
 
diff --git a/contrib/nix/ruby2.6-gemset.nix b/contrib/nix/ruby2.6-gemset.nix
@@ -311,10 +311,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
+      sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
       type = "gem";
     };
-    version = "0.4.4.4";
+    version = "0.4.4.5";
   };
   unicode-display_width = {
     groups = ["default"];
diff --git a/contrib/nix/ruby2.6-shell.nix b/contrib/nix/ruby2.6-shell.nix
@@ -14,13 +14,6 @@ let
       fiddle = attrs: {
         buildInputs = [ pkgs.libffi ];
       };
-      # Workaround for a new error in clang 16 (MacOS):
-      # https://github.com/blackwinter/unicode/pull/11
-      unicode = attrs: {
-        buildFlags = [
-          "--with-cflags=-Wno-incompatible-function-pointer-types"
-        ];
-      };
       # Workaround: remove rake from nativeBuildInputs, otherwise it causes
       # xapian-bindings to build against the default Ruby version
       # instead of our chosen version.
