Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ruby_3_1: drop

Browse Source
This commit is contained in:
Emily
2025-10-12 15:32:06 +01:00
parent 8b0f4d22b2
commit 3d86fc35c1
5 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/interpreters/ruby/default.nix
View File

@@ -57,13 +57,9 @@ let
}:
let
ver = version;
atLeast32 = lib.versionAtLeast ver.majMin "3.2";
# https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
yjitSupported =
atLeast32
&& (
stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)
);
stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64);
rubyDrv = lib.makeOverridable (
{
stdenv,
@@ -187,17 +183,13 @@ let
# make: *** [uncommon.mk:373: do-install-all] Error 1
enableParallelInstalling = false;
patches =
op useBaseRuby (
if atLeast32 then ./do-not-update-gems-baseruby-3.2.patch else ./do-not-update-gems-baseruby.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
];
cargoRoot = opString yjitSupport "yjit";
@@ -401,11 +393,6 @@ in
mkRubyVersion = rubyVersion;
mkRuby = generic;
ruby_3_1 = generic {
version = rubyVersion "3" "1" "7" "";
hash = "sha256-BVas1p8UHdrOA/pd2NdufqDY9SMu3wEkKVebzaqzDns=";
};
ruby_3_2 = generic {
version = rubyVersion "3" "2" "9" "";
hash = "sha256-q7rZjbmusVJ3Ow01ho5QADuMRn89BhUld8Tf7Z2I7So=";

14
pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch
View File

@@ -1,14 +0,0 @@
Do not update gems when building with base ruby
diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
--- ruby.old/common.mk
+++ ruby.new/common.mk
@@ -1298,7 +1298,7 @@ update-config_files: PHONY
config.guess config.sub
refresh-gems: update-bundled_gems prepare-gems
-prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
+prepare-gems:
update-gems$(gnumake:yes=-nongnumake): PHONY
$(ECHO) Downloading bundled gem files...

2
pkgs/top-level/aliases.nix
View File

@@ -2354,6 +2354,8 @@ mapAliases {
rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
rr-unstable = rr; # Added 2022-09-17
rtx = mise; # Added 2024-01-05
ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
runCommandNoCC = runCommand; # Added 2021-08-15
runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15

2
pkgs/top-level/all-packages.nix
View File

@@ -6036,7 +6036,6 @@ with pkgs;
})
mkRubyVersion
mkRuby
ruby_3_1
ruby_3_2
ruby_3_3
ruby_3_4
@@ -6046,7 +6045,6 @@ with pkgs;
ruby = ruby_3_3;
rubyPackages = rubyPackages_3_3;
rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems;
rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;
rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;

5
pkgs/top-level/pkg-config/pkg-config-data.json
View File

@@ -746,11 +746,6 @@
"python3"
]
},
"ruby-3.1": {
"attrPath": [
"ruby_3_1"
]
},
"sdl2": {
"attrPath": [
"SDL2"