Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/development/interpreters/ruby/build-ruby-gem/default.nix

@@ -32,7 +32,9 @@ lib.makeOverridable (
 , platform ? "ruby"
 , ruby ? defs.ruby
 , stdenv ? ruby.stdenv
-, namePrefix ? "${ruby.name}" + "-"
+, namePrefix ? (let
+    rubyName = builtins.parseDrvName ruby.name;
+  in "${rubyName.name}${rubyName.version}-")
 , buildInputs ? []
 , doCheck ? false
 , meta ? {}
@@ -89,7 +91,7 @@ stdenv.mkDerivation (attrs // {
     ++ lib.optional stdenv.isDarwin darwin.libobjc
     ++ buildInputs;
 
-  name = attrs.name or (namePrefix + gemName);
+  name = attrs.name or "${namePrefix}${gemName}-${version}";
 
   inherit src;
 

pkgs/development/interpreters/ruby/bundler-head.nix

@@ -1,18 +0,0 @@
-{ buildRubyGem, coreutils, fetchgit }:
-
-buildRubyGem {
-  name = "bundler-2015-01-11";
-  src = fetchgit {
-    url = "https://github.com/bundler/bundler.git";
-    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
-    leaveDotGit = true;
-  };
-  dontPatchShebangs = true;
-  postInstall = ''
-    find $out -type f -perm -0100 | while read f; do
-      substituteInPlace $f \
-         --replace "/usr/bin/env" "${coreutils}/bin/env"
-    done
-  '';
-}