ruby_3_0: drop
Ruby EOL is 31 March 2024, that is, during NixOS 23.11. We drop it early now to avoid any problem during the release time.
This commit is contained in:
parent
0a1bc8a2d2
commit
529892d918
@ -15,13 +15,6 @@ let
|
||||
config = import ./config.nix { inherit fetchFromSavannah; };
|
||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
|
||||
|
||||
openssl3Gem = fetchFromGitHub {
|
||||
owner = "ruby";
|
||||
repo = "openssl";
|
||||
rev = "v3.0.2";
|
||||
hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo=";
|
||||
};
|
||||
|
||||
# Contains the ruby version heuristics
|
||||
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
||||
|
||||
@ -156,12 +149,6 @@ let
|
||||
rm -rf $sourceRoot/{lib,test}/rubygems*
|
||||
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
|
||||
cp -r ${rubygems}/test/rubygems $sourceRoot/test
|
||||
'' + opString (ver.majMin == "3.0" && opensslSupport) ''
|
||||
# Replace the Gem by a OpenSSL3-compatible one.
|
||||
echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..."
|
||||
cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/
|
||||
cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/
|
||||
cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
@ -334,11 +321,6 @@ in {
|
||||
sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";
|
||||
};
|
||||
|
||||
ruby_3_0 = generic {
|
||||
version = rubyVersion "3" "0" "6" "";
|
||||
sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4=";
|
||||
};
|
||||
|
||||
ruby_3_1 = generic {
|
||||
version = rubyVersion "3" "1" "4" "";
|
||||
sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";
|
||||
|
@ -18046,7 +18046,6 @@ with pkgs;
|
||||
mkRubyVersion
|
||||
mkRuby
|
||||
ruby_2_7
|
||||
ruby_3_0
|
||||
ruby_3_1
|
||||
ruby_3_2
|
||||
ruby_3_3;
|
||||
@ -18055,7 +18054,6 @@ with pkgs;
|
||||
rubyPackages = rubyPackages_3_1;
|
||||
|
||||
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
|
||||
rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems;
|
||||
rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems;
|
||||
rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;
|
||||
rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
|
||||
|
@ -773,11 +773,6 @@
|
||||
"ruby_2_7"
|
||||
]
|
||||
},
|
||||
"ruby-3.0": {
|
||||
"attrPath": [
|
||||
"ruby_3_0"
|
||||
]
|
||||
},
|
||||
"ruby-3.1": {
|
||||
"attrPath": [
|
||||
"ruby_3_1"
|
||||
|
Loading…
Reference in New Issue
Block a user