From d9cf99225b7205ce521daab968d4b16e5e91a5c2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 14 Mar 2016 23:28:55 +0000
Subject: [PATCH] rubygems: 2.4.8 -> 2.6.2

---
 .../interpreters/ruby/gem_hook.patch          | 23 +++++++++++--------
 .../interpreters/ruby/rubygems-src.nix        |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/gem_hook.patch b/pkgs/development/interpreters/ruby/gem_hook.patch
index e75794fa556..78ff9ddbb1a 100644
--- a/pkgs/development/interpreters/ruby/gem_hook.patch
+++ b/pkgs/development/interpreters/ruby/gem_hook.patch
@@ -1,18 +1,21 @@
 diff --git a/rubygems/lib/rubygems/installer.rb b/rubygems/lib/rubygems/installer.rb
-index d1ef3cb..bf15652 100755
+index a88d393..8612901 100644
 --- a/rubygems/lib/rubygems/installer.rb
 +++ b/rubygems/lib/rubygems/installer.rb
-@@ -545,6 +545,13 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
+@@ -766,7 +766,15 @@ TEXT
+   # Ensures that files can't be installed outside the gem directory.
  
-       say path if Gem.configuration.really_verbose
-     end
-+
-+    if !ENV['NIX_POST_EXTRACT_FILES_HOOK'].nil?
-+      print "\nrunning NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{@gem_dir}\n"
-+      print `#{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{@gem_dir}`
-+      print "\nrunning NIX_POST_EXTRACT_FILES_HOOK done\n"
+   def extract_files
+-    @package.extract_files gem_dir
++    ret = @package.extract_files gem_dir
++    if ENV['NIX_POST_EXTRACT_FILES_HOOK']
++      puts
++      puts "running NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}"
++      system("#{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}")
++      puts "running NIX_POST_EXTRACT_FILES_HOOK done"
++      puts
 +    end
-+
++    ret
    end
  
    ##
diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index 191da98e56e..fea749e7de0 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,6 +1,6 @@
 { fetchurl
-, version ? "2.4.8"
-, sha256 ? "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss"
+, version ? "2.6.2"
+, sha256 ? "1j02ajici555f35vd6ky6m4bxs8lh8nqb1c59qqib4jp4ibcv6zy"
 }:
 fetchurl {
   url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";