Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/servers/serfdom/default.nix

pkgs/tools/filesystems/ceph/default.nix

@@ -0,0 +1,37 @@
+{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,
+ fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,
+ libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:
+
+stdenv.mkDerivation rec {
+  baseName="ceph";
+  version="0.79";
+  name="${baseName}-${version}";
+  buildInputs = [
+    fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat
+    fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig
+    python snappy which xfsprogs.lib xz
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  installFlags = "DESTDIR=\${out}";
+
+  enableParallelBuilding = true;
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph";
+    rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
+    sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
+  };
+
+  meta = {
+    inherit version;
+    description = "Distributed storage system";
+    maintainers = [
+      stdenv.lib.maintainers.ak
+    ];
+    platforms = with stdenv.lib.platforms; 
+      linux;
+  };
+}

pkgs/tools/filesystems/xfsprogs/default.nix

@@ -12,11 +12,26 @@ stdenv.mkDerivation rec {
     sed -i s,/bin/bash,`type -P bash`, install-sh
   '';
 
+  outputs = ["out" "lib"];
+
+  postInstall = ''
+    (cd include; make install-dev)
+    # The make install-dev target is broken when --disable-shared
+    mkdir -p $lib/lib $lib/include
+    cp ./libhandle/.libs/libhandle.a \
+       ./libxcmd/.libs/libxcmd.a \
+       ./libxlog/.libs/libxlog.a \
+       ./libxfs/.libs/libxfs.a $lib/lib
+    mv $out/include/* $lib/include
+  '';
+
+  enableParallelBuilding = true;
+
   buildInputs = [ libtool gettext libuuid ];
 
   configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared";
   preConfigure = ''
-    configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib"
+    configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib"
   '';
   disableStatic = false;