ruby.rubygems: 3.4.22 -> 3.5.3

Changelog: https://github.com/rubygems/rubygems/blob/v3.5.3/CHANGELOG.md
This commit is contained in:
Mario Rodas 2023-12-23 04:20:00 +00:00
parent a5f3d6219a
commit 5136d413f5
4 changed files with 13 additions and 14 deletions

View File

@ -148,7 +148,6 @@ let
postUnpack = opString rubygemsSupport '' postUnpack = opString rubygemsSupport ''
rm -rf $sourceRoot/{lib,test}/rubygems* rm -rf $sourceRoot/{lib,test}/rubygems*
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
cp -r ${rubygems}/test/rubygems $sourceRoot/test
''; '';
postPatch = '' postPatch = ''

View File

@ -14,15 +14,15 @@ diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_inst
index 34620860..00ab31d9 100644 index 34620860..00ab31d9 100644
--- a/lib/rubygems/dependency_installer.rb --- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb
@@ -18,7 +18,7 @@ class Gem::DependencyInstaller @@ -17,7 +17,7 @@ class Gem::DependencyInstaller
extend Gem::Deprecate extend Gem::Deprecate
DEFAULT_OPTIONS = { # :nodoc: DEFAULT_OPTIONS = { # :nodoc:
- :env_shebang => false, - env_shebang: false,
+ :env_shebang => true, + env_shebang: true,
:document => %w[ri], document: %w[ri],
:domain => :both, # HACK dup domain: :both, # HACK: dup
:force => false, force: false,
-- --
2.21.0 2.21.0

View File

@ -12,15 +12,15 @@ diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb
index ed680d65..749b9ea6 100644 index ed680d65..749b9ea6 100644
--- a/lib/rubygems/path_support.rb --- a/lib/rubygems/path_support.rb
+++ b/lib/rubygems/path_support.rb +++ b/lib/rubygems/path_support.rb
@@ -23,7 +23,7 @@ class Gem::PathSupport @@ -24,7 +24,7 @@ class Gem::PathSupport
# hashtable, or defaults to ENV, the system environment. # hashtable, or defaults to ENV, the system environment.
# #
def initialize(env) def initialize(env)
- @home = env["GEM_HOME"] || Gem.default_dir - @home = normalize_home_dir(env["GEM_HOME"] || Gem.default_dir)
+ @home = env["GEM_HOME"] || Gem.user_dir + @home = normalize_home_dir(env["GEM_HOME"] || Gem.user_dir || Gem.default_dir)
@path = split_gem_path env["GEM_PATH"], @home
if File::ALT_SEPARATOR @spec_cache_dir = env["GEM_SPEC_CACHE"] || Gem.default_spec_cache_dir
@home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
-- --
2.21.0 2.21.0

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rubygems"; pname = "rubygems";
version = "3.4.22"; version = "3.5.3";
src = fetchurl { src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
hash = "sha256-gD+nd3bRHT0btWOCZhbIERJEJeAzGtH9mDxBRARqYVY="; hash = "sha256-8xFe6AgJkvJXwBYbgR4HsBLyAXXtiTSfsayYl33cXJw=";
}; };
patches = [ patches = [