public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rubygems: 3.1.3 -> 3.2.16

This commit is contained in:
Andrew Childs 2021-04-20 18:12:37 +09:00
parent cf0edc0dea
commit f16053c34d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/ruby/default.nix
View File

@ -12,7 +12,7 @@ let
opString = lib.optionalString; opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; }; 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 # Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; }; rubyVersion = import ./ruby-version.nix { inherit lib; };
@ -112,7 +112,17 @@ let
patchLevel = ver.patchLevel; patchLevel = ver.patchLevel;
}).${ver.majMinTiny} }).${ver.majMinTiny}
++ op atLeast27 ./do-not-regenerate-revision.h.patch ++ op atLeast27 ./do-not-regenerate-revision.h.patch
++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch; ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch
# Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but
# the resulting error was swallowed. Newer rubygems no longer swallows
# this error. We upgrade rubygems when rubygemsSupport is enabled, so
# we have to fix this bug to prevent the install step from failing.
# See https://github.com/ruby/ruby/pull/2930
++ op (!atLeast30 && rubygemsSupport)
(fetchpatch {
url = "https://github.com/ruby/ruby/commit/261d8dd20afd26feb05f00a560abd99227269c1c.patch";
sha256 = "0wrii25cxcz2v8bgkrf7ibcanjlxwclzhayin578bf0qydxdm9qy";
});
postUnpack = opString rubygemsSupport '' postUnpack = opString rubygemsSupport ''
rm -rf $sourceRoot/{lib,test}/rubygems* rm -rf $sourceRoot/{lib,test}/rubygems*

11
pkgs/development/interpreters/ruby/rubygems/default.nix
View File

@ -1,23 +1,18 @@
{ stdenv, lib, fetchurl, fetchpatch }: { stdenv, lib, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rubygems"; name = "rubygems";
version = "3.1.3"; version = "3.2.16";
src = fetchurl { src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp"; sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0";
}; };
patches = [ patches = [
./0001-add-post-extract-hook.patch ./0001-add-post-extract-hook.patch
./0002-binaries-with-env-shebang.patch ./0002-binaries-with-env-shebang.patch
./0003-gem-install-default-to-user.patch ./0003-gem-install-default-to-user.patch
(fetchpatch {
url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch";
sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9";
})
]; ];
installPhase = '' installPhase = ''