Merge branch 'master.upstream' into staging.upstream

2015-09-04 12:05:11 -07:00
parent b68e45dfa7 c985530a25
commit c6f689f951
41 changed files with 1072 additions and 268 deletions
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
  src = fetchgit {
    url = "https://github.com/bundler/bundler.git";
    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
+    sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9";
    leaveDotGit = true;
  };
  dontPatchShebangs = true;