Unverified Commit 5dcbaf3c authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #264361 from RaitoBezarius/drop-ruby3

parents c7eeda74 529892d9

pkgs/applications/version-management/gitlab/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv

, ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl

, ruby_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl

, gitlabEnterprise ? false, callPackage, yarn

, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config

}:
@@ -17,7 +17,7 @@ let 


  rubyEnv = bundlerEnv rec {

    name = "gitlab-env-${version}";

    ruby = ruby_3_0;

    ruby = ruby_3_2;

    gemdir = ./rubyEnv;

    gemset =

      let x = import (gemdir + "/gemset.nix") src;

pkgs/development/interpreters/ruby/default.nix

+0 −18
Original line number Diff line number Diff line
@@ -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=";

pkgs/development/web/mailcatcher/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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";

pkgs/servers/http/unit/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, withPHP82 ? false, php82

, withPerl536 ? false, perl536

, withPerl538 ? true, perl538

, withRuby_3_0 ? false, ruby_3_0

, withRuby_3_1 ? true, ruby_3_1

, withRuby_3_2 ? false, ruby_3_2

, withSSL ? true, openssl ? null
@@ -47,7 +46,6 @@ in stdenv.mkDerivation rec { 
    ++ optional withPHP82 php82-unit

    ++ optional withPerl536 perl536

    ++ optional withPerl538 perl538

    ++ optional withRuby_3_0 ruby_3_0

    ++ optional withRuby_3_1 ruby_3_1

    ++ optional withRuby_3_2 ruby_3_2

    ++ optional withSSL openssl;
@@ -70,7 +68,6 @@ in stdenv.mkDerivation rec { 
    ${optionalString withPHP82      "./configure php    --module=php81    --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"}

    ${optionalString withPerl536    "./configure perl   --module=perl536  --perl=${perl536}/bin/perl"}

    ${optionalString withPerl538    "./configure perl   --module=perl538  --perl=${perl538}/bin/perl"}

    ${optionalString withRuby_3_0   "./configure ruby   --module=ruby30   --ruby=${ruby_3_0}/bin/ruby"}

    ${optionalString withRuby_3_1   "./configure ruby   --module=ruby31   --ruby=${ruby_3_1}/bin/ruby"}

    ${optionalString withRuby_3_2   "./configure ruby   --module=ruby32   --ruby=${ruby_3_2}/bin/ruby"}

  '';

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -18044,7 +18044,6 @@ with pkgs; 
    mkRubyVersion

    mkRuby

    ruby_2_7

    ruby_3_0

    ruby_3_1

    ruby_3_2

    ruby_3_3;
@@ -18053,7 +18052,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;