Merge pull request #130411 from marsam/ruby-update-rubygems

ruby: rubygems 3.2.16 -> 3.2.24
This commit is contained in:
Mario Rodas 2021-07-17 07:02:14 -05:00 committed by GitHub
commit 4015870990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions

View File

@ -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; };

View File

@ -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 = ''

View File

@ -242,7 +242,10 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs;
passthru = passthru // { isRubyGem = true; };
inherit meta;
meta = {
# default to Ruby's platforms
platforms = ruby.meta.platforms;
} // meta;
})
)