Merge branch 'master' into staging

pkgs/tools/filesystems/ceph/generic.nix

@@ -101,7 +101,7 @@ let
   wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
-    + " --set PATH : \"$out/bin\"";
+    + " --set PATH \"$out/bin\"";
 in
 stdenv.mkDerivation {
   name="ceph-${version}";

pkgs/tools/filesystems/ceph/git.nix

@@ -1,12 +1,12 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-15";
+  version = "2015-07-20";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "66dcbaed3c3c8e4b5367ba1cd2859271e692e7e0";
-    sha256 = "05jba4zjrkksrra6rz4kby8vv4ja8fa73wvwcw3yn3mn1x9kyz2g";
+    rev = "ce534e1e0addfe93194a553cec98799ea97affe4";
+    sha256 = "19i9fp06fdyhx5x6ryw5q81id0354601yxnywvir3i9hy51p9xaz";
   };
 
   patches = [ ./fix-pythonpath.patch ];