commit e7f1796251de252d54984473d1722a9995dbce80
parent f643412f0f466d93ec0ce00b1283824951989600
Author: Dan Callaghan <djc@djc.id.au>
Date: Mon, 1 Jan 2024 16:56:51 +1100
xapian-ruby: 1.4.18 → 1.4.22
This fixes some "undefining the allocator of T_DATA class" warnings.
Leave Ruby 2.6 using 1.4.18 because 1.4.22 does not compile against the
older Xapian in that old revision of nixpkgs.
Diffstat:
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Manifest.txt b/Manifest.txt
@@ -33,6 +33,8 @@ contrib/nix/ruby2.4-shell.nix
contrib/nix/ruby2.5-Gemfile.lock
contrib/nix/ruby2.5-gemset.nix
contrib/nix/ruby2.5-shell.nix
+contrib/nix/ruby2.6-Gemfile.lock
+contrib/nix/ruby2.6-gemset.nix
contrib/nix/ruby2.6-shell.nix
contrib/nix/ruby2.7-shell.nix
contrib/nix/ruby3.0-shell.nix
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/Gemfile.lock
@@ -47,7 +47,7 @@ GEM
ruby-progressbar (1.11.0)
unicode (0.4.4.4)
unicode-display_width (2.2.0)
- xapian-ruby (1.4.18)
+ xapian-ruby (1.4.22)
PLATFORMS
aarch64-linux
diff --git a/contrib/nix/gemset.nix b/contrib/nix/gemset.nix
@@ -311,9 +311,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z8arjkd0nlj6zv9in2sihmbwpbd17a10lsv7nwii7z0jjscyxpp";
+ sha256 = "0xlzgk2sis7nnasiplpg6x7mdvqa17ahq2d27i8fd5hs8dmqcsh2";
type = "gem";
};
- version = "1.4.18";
+ version = "1.4.22";
};
}
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/ruby2.6-Gemfile.lock
diff --git a/contrib/nix/gemset.nix b/contrib/nix/ruby2.6-gemset.nix
diff --git a/contrib/nix/ruby2.6-shell.nix b/contrib/nix/ruby2.6-shell.nix
@@ -8,8 +8,8 @@ let
name = "ruby2.6-gems-for-sup";
ruby = pkgs.ruby_2_6;
gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
+ lockfile = ./ruby2.6-Gemfile.lock;
+ gemset = ./ruby2.6-gemset.nix;
gemConfig = pkgs.defaultGemConfig // {
# Workaround: remove rake from nativeBuildInputs, otherwise it causes
# xapian-bindings to build against the default Ruby version