pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #186571 from marsam/update-rubygems

rubygems: 3.2.26 -> 3.3.20

authored by Mario Rodas and committed by GitHub c07f7e3c d1621047

+17 -18
unified split
+2 -8
pkgs/development/interpreters/ruby/default.nix
··· 19 20 generic = { version, sha256 }: let 21 ver = version; 22 - tag = ver.gitTag; 23 atLeast30 = lib.versionAtLeast ver.majMin "3.0"; 24 self = lib.makeOverridable ( 25 { stdenv, buildPackages, lib ··· 225 ++ op useBaseRuby baseRuby; 226 227 meta = with lib; { 228 - description = "The Ruby language"; 229 - homepage = "http://www.ruby-lang.org/en/"; 230 license = licenses.ruby; 231 maintainers = with maintainers; [ vrthra manveru marsam ]; 232 platforms = platforms.all; ··· 248 ruby = self; 249 }) withPackages gems; 250 251 - # deprecated 2016-09-21 252 - majorVersion = ver.major; 253 - minorVersion = ver.minor; 254 - teenyVersion = ver.tiny; 255 - patchLevel = ver.patchLevel; 256 } // lib.optionalAttrs useBaseRuby { 257 inherit baseRuby; 258 };
··· 19 20 generic = { version, sha256 }: let 21 ver = version; 22 atLeast30 = lib.versionAtLeast ver.majMin "3.0"; 23 self = lib.makeOverridable ( 24 { stdenv, buildPackages, lib ··· 224 ++ op useBaseRuby baseRuby; 225 226 meta = with lib; { 227 + description = "An object-oriented language for quick and easy programming"; 228 + homepage = "https://www.ruby-lang.org/"; 229 license = licenses.ruby; 230 maintainers = with maintainers; [ vrthra manveru marsam ]; 231 platforms = platforms.all; ··· 247 ruby = self; 248 }) withPackages gems; 249 250 } // lib.optionalAttrs useBaseRuby { 251 inherit baseRuby; 252 };
+11 -6
pkgs/development/interpreters/ruby/patchsets.nix
··· 2 3 { 4 "2.7.6" = ops useRailsExpress [ 5 - "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" 6 - "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" 7 - "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" 8 ]; 9 "3.0.4" = ops useRailsExpress [ 10 - "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" 11 - "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" 12 ]; 13 - "3.1.2" = ops useRailsExpress [ # no patches yet (2021-12-25) 14 ]; 15 }
··· 2 3 { 4 "2.7.6" = ops useRailsExpress [ 5 + "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-with-openssl-dir-option.patch" 6 + "${patchSet}/patches/ruby/2.7/head/railsexpress/02-fix-broken-tests-caused-by-ad.patch" 7 + "${patchSet}/patches/ruby/2.7/head/railsexpress/03-improve-gc-stats.patch" 8 + "${patchSet}/patches/ruby/2.7/head/railsexpress/04-more-detailed-stacktrace.patch" 9 + "${patchSet}/patches/ruby/2.7/head/railsexpress/05-malloc-trim.patch" 10 ]; 11 "3.0.4" = ops useRailsExpress [ 12 + "${patchSet}/patches/ruby/3.0/head/railsexpress/01-fix-with-openssl-dir-option.patch" 13 + "${patchSet}/patches/ruby/3.0/head/railsexpress/02-improve-gc-stats.patch" 14 + "${patchSet}/patches/ruby/3.0/head/railsexpress/03-malloc-trim.patch" 15 ]; 16 + "3.1.2" = ops useRailsExpress [ 17 + "${patchSet}/patches/ruby/3.1/head/railsexpress/01-improve-gc-stats.patch" 18 + "${patchSet}/patches/ruby/3.1/head/railsexpress/02-malloc-trim.patch" 19 ]; 20 }
+2 -2
pkgs/development/interpreters/ruby/rubygems/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "rubygems"; 5 - version = "3.2.26"; 6 7 src = fetchurl { 8 url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; 9 - sha256 = "sha256-9wa6lOWnua8zBblQKRgjjiTVPYp2TW0n7XOvgW7u1e8="; 10 }; 11 12 patches = [
··· 2 3 stdenv.mkDerivation rec { 4 pname = "rubygems"; 5 + version = "3.3.20"; 6 7 src = fetchurl { 8 url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; 9 + sha256 = "sha256-VTUMZ2mqbszM7uXOYV6Grg7dkeGAGVXYjBX0hA/vOTg="; 10 }; 11 12 patches = [
+2 -2
pkgs/development/interpreters/ruby/rvm-patchsets.nix
··· 3 fetchFromGitHub { 4 owner = "skaes"; 5 repo = "rvm-patchsets"; 6 - rev = "0251817e2b9d5f73370bbbb12fdf7f7089bd1ac3"; 7 - sha256 = "1biiq5xzzdfb4hr1sgmx14i2nr05xa9w21pc7dl8c5n4f2ilg8ss"; 8 }
··· 3 fetchFromGitHub { 4 owner = "skaes"; 5 repo = "rvm-patchsets"; 6 + rev = "a6429bb1a7fb9b5798c22f43338739a6c192b42d"; 7 + sha256 = "sha256-NpSa+uGQA1rfHNcLzPNTK65J+Wk9ZlzhHFePDA4uuo0="; 8 }