lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #264361 from RaitoBezarius/drop-ruby3

authored by

Ryan Lahfa and committed by
GitHub
5dcbaf3c c7eeda74

+4 -32
+2 -2
pkgs/applications/version-management/gitlab/default.nix
··· 1 1 { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv 2 - , ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl 2 + , ruby_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl 3 3 , gitlabEnterprise ? false, callPackage, yarn 4 4 , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config 5 5 }: ··· 17 17 18 18 rubyEnv = bundlerEnv rec { 19 19 name = "gitlab-env-${version}"; 20 - ruby = ruby_3_0; 20 + ruby = ruby_3_2; 21 21 gemdir = ./rubyEnv; 22 22 gemset = 23 23 let x = import (gemdir + "/gemset.nix") src;
-18
pkgs/development/interpreters/ruby/default.nix
··· 15 15 config = import ./config.nix { inherit fetchFromSavannah; }; 16 16 rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; 17 17 18 - openssl3Gem = fetchFromGitHub { 19 - owner = "ruby"; 20 - repo = "openssl"; 21 - rev = "v3.0.2"; 22 - hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo="; 23 - }; 24 - 25 18 # Contains the ruby version heuristics 26 19 rubyVersion = import ./ruby-version.nix { inherit lib; }; 27 20 ··· 156 149 rm -rf $sourceRoot/{lib,test}/rubygems* 157 150 cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib 158 151 cp -r ${rubygems}/test/rubygems $sourceRoot/test 159 - '' + opString (ver.majMin == "3.0" && opensslSupport) '' 160 - # Replace the Gem by a OpenSSL3-compatible one. 161 - echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..." 162 - cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/ 163 - cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/ 164 - cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/ 165 152 ''; 166 153 167 154 postPatch = '' ··· 332 319 ruby_2_7 = generic { 333 320 version = rubyVersion "2" "7" "8" ""; 334 321 sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; 335 - }; 336 - 337 - ruby_3_0 = generic { 338 - version = rubyVersion "3" "0" "6" ""; 339 - sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4="; 340 322 }; 341 323 342 324 ruby_3_1 = generic {
+2 -2
pkgs/development/web/mailcatcher/default.nix
··· 1 - { pkgs, lib, bundlerApp, bundlerUpdateScript }: 1 + { ruby_3_2, lib, bundlerApp, bundlerUpdateScript }: 2 2 3 3 bundlerApp { 4 4 pname = "mailcatcher"; 5 5 gemdir = ./.; 6 6 exes = [ "mailcatcher" "catchmail" ]; 7 - ruby = pkgs.ruby_3_0; 7 + ruby = ruby_3_2; 8 8 9 9 passthru.updateScript = bundlerUpdateScript "mailcatcher"; 10 10
-3
pkgs/servers/http/unit/default.nix
··· 5 5 , withPHP82 ? false, php82 6 6 , withPerl536 ? false, perl536 7 7 , withPerl538 ? true, perl538 8 - , withRuby_3_0 ? false, ruby_3_0 9 8 , withRuby_3_1 ? true, ruby_3_1 10 9 , withRuby_3_2 ? false, ruby_3_2 11 10 , withSSL ? true, openssl ? null ··· 47 46 ++ optional withPHP82 php82-unit 48 47 ++ optional withPerl536 perl536 49 48 ++ optional withPerl538 perl538 50 - ++ optional withRuby_3_0 ruby_3_0 51 49 ++ optional withRuby_3_1 ruby_3_1 52 50 ++ optional withRuby_3_2 ruby_3_2 53 51 ++ optional withSSL openssl; ··· 70 68 ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} 71 69 ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} 72 70 ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} 73 - ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} 74 71 ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} 75 72 ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} 76 73 '';
-2
pkgs/top-level/all-packages.nix
··· 18044 18044 mkRubyVersion 18045 18045 mkRuby 18046 18046 ruby_2_7 18047 - ruby_3_0 18048 18047 ruby_3_1 18049 18048 ruby_3_2 18050 18049 ruby_3_3; ··· 18053 18052 rubyPackages = rubyPackages_3_1; 18054 18053 18055 18054 rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; 18056 - rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; 18057 18055 rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; 18058 18056 rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; 18059 18057 rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
-5
pkgs/top-level/pkg-config/pkg-config-data.json
··· 773 773 "ruby_2_7" 774 774 ] 775 775 }, 776 - "ruby-3.0": { 777 - "attrPath": [ 778 - "ruby_3_0" 779 - ] 780 - }, 781 776 "ruby-3.1": { 782 777 "attrPath": [ 783 778 "ruby_3_1"