diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 18:00:56 +0000 |
| commit | d6b748b2b34de00a07b5620ff4b30c14a7d8078a (patch) | |
| tree | 90b3bf6284d194c5e472c16d8bdbbad2db5504b4 /pkgs/development/interpreters | |
| parent | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (diff) | |
| parent | a22cd1991064d383f96a786d915507d237e042a0 (diff) | |
| download | nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.gz nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.bz2 nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.lz nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.xz nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.zst nixlib-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.zip | |
Merge master into staging-next
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 = '' |