Unverified Commit e2032ab4 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #223916 from marsam/update-ruby 

ruby: 2.7.7 -> 2.7.8, 3.0.5 -> 3.0.6, 3.1.3 -> 3.1.4, 3.2.1 -> 3.2.2
parents f6de86e5 3f2cadf4

pkgs/development/interpreters/ruby/default.nix

+8 −16
Original line number Diff line number Diff line
@@ -112,14 +112,6 @@ let 
              sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";

            })

          ]

          ++ ops (ver.majMin == "3.1") [

            # Ruby 3.1.3 cannot find pkg-config in mkmf.rb

            # https://bugs.ruby-lang.org/issues/19189

            (fetchpatch {

              url = "https://github.com/ruby/ruby/commit/613fca01486e47dee9364a2fd86b5f5e77fe23c8.patch";

              sha256 = "sha256-0Ku7l6VEpcvxexL9QA5+mNER4v8gYZOJhAjhCL1WDpw=";

            })

          ]

          ++ ops (!atLeast30 && rubygemsSupport) [

            # We upgrade rubygems to a version that isn't compatible with the

            # ruby 2.7 installer. Backport the upstream fix.
@@ -322,23 +314,23 @@ in { 
  mkRuby = generic;



  ruby_2_7 = generic {

    version = rubyVersion "2" "7" "7" "";

    sha256 = "sha256-4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A=";

    version = rubyVersion "2" "7" "8" "";

    sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";

  };



  ruby_3_0 = generic {

    version = rubyVersion "3" "0" "5" "";

    sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y=";

    version = rubyVersion "3" "0" "6" "";

    sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4=";

  };



  ruby_3_1 = generic {

    version = rubyVersion "3" "1" "3" "";

    sha256 = "sha256-XqSYo19M0Vh1IApS3eQrbrF54SZOF9eHMsOlfNHGq54=";

    version = rubyVersion "3" "1" "4" "";

    sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";

  };



  ruby_3_2 = generic {

    version = rubyVersion "3" "2" "1" "";

    sha256 = "sha256-E9Z5AWYO4yF9vZ3VYFk0a9QhLOZKacMG71LfZJNfjb0=";

    version = rubyVersion "3" "2" "2" "";

    sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=";

    cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";

  };

}