Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

pkgs/tools/filesystems/ceph/default.nix

@@ -14,12 +14,12 @@ let
 in
 stdenv.mkDerivation rec {
   name="ceph-${version}";
-  version="0.88";
+  version="0.89";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1wf77mlx94h2mn75qqgb37xbdagl7zh0b579qh7gc1z4wcb8b8h0";
+    sha256 = "1ky1j8qb2nz3qzlhdcb6ppdjx7wb3icq7n0l5mm9x3q2ijbwvhlz";
   };
 
   patches = [

pkgs/tools/filesystems/duff/default.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, autoconf, automake, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "duff-${version}";
+  version = "0.5.2";
+
+  src = fetchurl {
+    url = "https://github.com/elmindreda/duff/archive/${version}.tar.gz";
+    sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058";
+  };
+
+  buildInputs = [ autoconf automake gettext ];
+
+  preConfigure = ''
+    # duff is currently badly packaged, requiring us to do extra work here that
+    # should be done upstream. If that is ever fixed, this entire phase can be
+    # removed along with all buildInputs.
+
+    # gettexttize rightly refuses to run non-interactively:
+    cp ${gettext}/bin/gettextize .
+    substituteInPlace gettextize \
+      --replace "read dummy" "echo (Automatically acknowledged)"
+    ./gettextize
+    sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \
+      -i configure.ac
+    autoreconf -i
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Quickly find duplicate files.";
+    homepage = http://duff.dreda.org/;
+    license = with licenses; zlib;
+    longDescription = ''
+      Duff is a Unix command-line utility for quickly finding duplicates in
+      a given set of files.
+    '';
+    maintainers = with maintainers; [ nckx ];
+    platforms = with platforms; all;
+  };
+}