diff --git a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch b/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch deleted file mode 100644 index 91f221e19680..000000000000 --- a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch +++ /dev/null @@ -1,36 +0,0 @@ -A change introduced in PR https://github.com/rubygems/rubygems/pull/7797 -does not delete the binstub lock files after the binstub file is created. - -This change was introduced in rubygems 3.5.15, -and this version causes Hydra builds to fail, in particular mastodon. - -A resolution is delete these binstub lock files after the binstub file is created -to prevent lock files from ending up in the bin folders of the various derivations -which will cause the build to fail. - ---- -diff --git a/bundler/lib/bundler/rubygems_ext.rb b/bundler/lib/bundler/rubygems_ext.rb -index 503959bba7..603b30e277 100644 ---- a/bundler/lib/bundler/rubygems_ext.rb -+++ b/bundler/lib/bundler/rubygems_ext.rb -@@ -47,6 +47,8 @@ def self.open_file_with_flock(path, &block) - else - File.open(path, flags, &block) - end -+ ensure -+ FileUtils.rm_f(path) if File.exist?(path) - end - end - end -diff --git a/lib/rubygems.rb b/lib/rubygems.rb -index 569041f3d7..bcc95ae85c 100644 ---- a/lib/rubygems.rb -+++ b/lib/rubygems.rb -@@ -796,6 +796,8 @@ def self.open_file_with_flock(path, &block) - else - open_file(path, flags, &block) - end -+ ensure -+ FileUtils.rm_f(path) if File.exist?(path) - end - end diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 9fbfdb59fb07..68e404be0ea8 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -7,18 +7,17 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.16"; + version = "3.5.21"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI="; + hash = "sha256-lZs+SIaYaXXYXQsCEXeQiD5TuNBRUp326s/mR0XvMWA="; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - ./0004-delete-binstub-lock-file.patch ]; installPhase = ''