diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2021-07-17 07:02:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-17 07:02:14 -0500 |
commit | 40158709901159aa782e31ad49da4484aba739f2 (patch) | |
tree | e505c5834b8c245d297fd4f63e46ed6beb4fb24f /pkgs/development/interpreters | |
parent | 1ae6c6e92104ae774c5d7fb763001ea3d470748e (diff) | |
parent | 0b1132dba50d48cdf7738f3986ac49b717d1f355 (diff) | |
download | nixlib-40158709901159aa782e31ad49da4484aba739f2.tar nixlib-40158709901159aa782e31ad49da4484aba739f2.tar.gz nixlib-40158709901159aa782e31ad49da4484aba739f2.tar.bz2 nixlib-40158709901159aa782e31ad49da4484aba739f2.tar.lz nixlib-40158709901159aa782e31ad49da4484aba739f2.tar.xz nixlib-40158709901159aa782e31ad49da4484aba739f2.tar.zst nixlib-40158709901159aa782e31ad49da4484aba739f2.zip |
Merge pull request #130411 from marsam/ruby-update-rubygems
ruby: rubygems 3.2.16 -> 3.2.24
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/rubygems/default.nix | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3863b97d6b17..ba132acf722f 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index cf2ca1b766ea..6f089e51221f 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,24 +1,18 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; - version = "3.2.16"; + version = "3.2.24"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0"; + sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - # Ensure tmp directory are not left behind - # https://github.com/rubygems/rubygems/pull/4610 - (fetchpatch { - url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch"; - sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms="; - }) ]; installPhase = '' |