Skip to content

ruby_{3_3,3_4}: backport patches for GCC 15 and LLVM 21 #451386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
Oct 13, 2025
Merged

ruby_{3_3,3_4}: backport patches for GCC 15 and LLVM 21 #451386

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb57da
ruby_{3_3,3_4}: backport patches for GCC 15 and LLVM 21
emilazy Oct 12, 2025
f0166da
ruby: avoid rebuilding default ruby on linux for now
vcunat Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions pkgs/development/interpreters/ruby/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,36 @@ let
# make: *** [uncommon.mk:373: do-install-all] Error 1
enableParallelInstalling = false;

patches = op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch ++ [
# When using a baseruby, ruby always sets "libdir" to the build
# directory, which nix rejects due to a reference in to /build/ in
# the final product. Removing this reference doesn't seem to break
# anything and fixes cross compilation.
./dont-refer-to-build-dir.patch
];
patches =
op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch
++ [
# When using a baseruby, ruby always sets "libdir" to the build
# directory, which nix rejects due to a reference in to /build/ in
# the final product. Removing this reference doesn't seem to break
# anything and fixes cross compilation.
./dont-refer-to-build-dir.patch
]
# TODO: drop the isClang condition
++ ops (lib.versionOlder ver.majMin "3.4" && stdenv.cc.isClang) [
(fetchpatch {
name = "ruby-3.3-fix-llvm-21.patch";
url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch";
excludes = [ "version.h" ];
hash = "sha256-dV98gXXTSKM2ZezTvhVXNaKaXJxiWKEeUbqqL360cWw=";
})
]
++ ops (lib.versionAtLeast ver.majMin "3.4" && lib.versionOlder ver.majMin "3.5") [
(fetchpatch {
name = "ruby-3.4-fix-gcc-15-llvm-21-1.patch";
url = "https://github.com/ruby/ruby/commit/846bb760756a3bf1ab12d56d8909e104f16e6940.patch";
hash = "sha256-+f0mzHsGAe9FT9NWE345BxzaB6vmWzMTvEfWF84uFOs=";
})
(fetchpatch {
name = "ruby-3.4-fix-gcc-15-llvm-21-2.patch";
url = "https://github.com/ruby/ruby/commit/18e176659e8afe402cab7d39972f2d56f2cf378f.patch";
hash = "sha256-TKPG1hcC1G2WmUkvNV6QSnvUpTEDqrYKrIk/4fAS8QE=";
})
];

cargoRoot = opString yjitSupport "yjit";

Expand Down
Loading