diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-11-17 18:43:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 18:43:35 +0100 |
| commit | 5dcbaf3cc3697758f68730d6a0deb662f7febda0 (patch) | |
| tree | dcaf549af40562769b04dc06bfd8acf05d59d85d /pkgs/development | |
| parent | c7eeda7413eabc79191719a97ec54601888009c8 (diff) | |
| parent | 529892d918e5165e5f13a441799e13eeeedc2519 (diff) | |
| download | nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar.gz nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar.bz2 nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar.lz nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar.xz nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.tar.zst nixlib-5dcbaf3cc3697758f68730d6a0deb662f7febda0.zip | |
Merge pull request #264361 from RaitoBezarius/drop-ruby3
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/web/mailcatcher/default.nix | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 903a101aa490..3ccbe1e855a3 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -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="; diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index df6ed0a5233a..17d25378d8cd 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, bundlerApp, bundlerUpdateScript }: +{ ruby_3_2, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; - ruby = pkgs.ruby_3_0; + ruby = ruby_3_2; passthru.updateScript = bundlerUpdateScript "mailcatcher"; |