ruby_3_4: 3.4.7 -> 3.4.8
https://github.com/ruby/ruby/releases/tag/v3_4_8
This commit is contained in:
@@ -190,27 +190,13 @@ 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
|
||||
]
|
||||
++ 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=";
|
||||
})
|
||||
];
|
||||
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
|
||||
];
|
||||
|
||||
cargoRoot = opString yjitSupport "yjit";
|
||||
|
||||
@@ -421,8 +407,8 @@ in
|
||||
};
|
||||
|
||||
ruby_3_4 = generic {
|
||||
version = rubyVersion "3" "4" "7" "";
|
||||
hash = "sha256-I4FabQlWlveRkJD9w+L5RZssg9VyJLLkRs4fX3Mz7zY=";
|
||||
version = rubyVersion "3" "4" "8" "";
|
||||
hash = "sha256-U8TdrUH7thifH17g21elHVS9H4f4dVs9aGBBVqNbBFs=";
|
||||
cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user