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

23 files changed, 163 insertions, 111 deletions

diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix
index 2eed4335af12..1890e9c5266b 100644
--- a/pkgs/tools/X11/sct/default.nix
+++ b/pkgs/tools/X11/sct/default.nix
@@ -5,6 +5,14 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = http://www.tedunangst.com/flak/files/sct.c;
     sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd";
+    
+    # Discussion regarding the checksum and the source code can be found in issue #17163 
+    # The code seems unmaintained, yet an unknown (probably small change) in the code caused 
+    # failed builds as the checksum had changed.
+    # The checksum is updated for now, however, this is unpractical and potentially unsafe 
+    # so any future changes might warrant a fork of the (feature complete) project. 
+    # The code is under public domain.
+    
   };
   phases = ["patchPhase" "buildPhase" "installPhase"];
   patchPhase = ''
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index ccc87a231a16..1e07b4114a55 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unrar-${version}";
-  version = "5.4.2";
+  version = "5.4.4";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "1ggiad65j8kzhixrgvmda32khaqs8p0pqcdpwarn1b6vmfl5y7fr";
+    sha256 = "10rdbp19mcblgzhs9xh3lr1d1x0n1clyc46flg21ic3427b6assm";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch
deleted file mode 100644
index 8a886f2bc78e..000000000000
--- a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd54ad8..ebb33d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,8 +5,7 @@ project(fcitx)
- set(version 4.2.9)
- 
- 
--find_package(ECM 0.0.11 REQUIRED NO_MODULE)
--set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
- set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
- 
- set_property(GLOBAL PROPERTY "__FCITX_INTERNAL_BUILD" On)
---- a/cmake/FindXKBCommon.cmake
-+++ b/cmake/FindXKBCommon.cmake
-@@ -1,5 +1,5 @@
- 
--include(ECMFindModuleHelpersStub)
-+include(ECMFindModuleHelpers)
- 
- ecm_find_package_version_check(XKBCommon)
- 
--- 
-2.8.0
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch
deleted file mode 100644
index 8fe100dd3b24..000000000000
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8e729a..ebd3603 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,9 +5,7 @@ project(fcitx-qt5)
- set(FcitxQt5_VERSION 1.0.0)
- set(REQUIRED_QT_VERSION 5.1.0)
- 
--find_package(ECM 1.4.0 REQUIRED NO_MODULE)
--
--set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- 
- include(GNUInstallDirs)
- include(FeatureSummary)
-diff --git a/cmake/FindXKBCommon.cmake b/cmake/FindXKBCommon.cmake
-index a645584..de0007d 100644
---- a/cmake/FindXKBCommon.cmake
-+++ b/cmake/FindXKBCommon.cmake
-@@ -1,5 +1,5 @@
- 
--include(ECMFindModuleHelpersStub)
-+include(ECMFindModuleHelpers)
- 
- ecm_find_package_version_check(XKBCommon)
- 
--- 
-2.8.0
-
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index fc9dd1e6a253..3f421e327d71 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }:
+{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
@@ -9,19 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";
   };
 
-  # The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun
-  postUnpack = ''
-    ${lib.concatMapStrings (f: ''
-      ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/
-    '')
-    [ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake"
-      "ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake"
-      "ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]}
-  '';
-
-  patches = [ ./fcitx-qt5-ecm.patch ];
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
 
-  buildInputs = [ cmake fcitx pkgconfig qtbase ];
+  buildInputs = [ fcitx qtbase ];
 
   preInstall = ''
     substituteInPlace platforminputcontext/cmake_install.cmake \
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index ba3a3f76ed93..c489b3e4ed74 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
-, dbus, gtk2, gtk3, qt4, kde5
+, dbus, gtk2, gtk3, qt4, extra-cmake-modules
 }:
 
 stdenv.mkDerivation rec {
@@ -13,22 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk";
   };
 
-  postUnpack = ''
-    ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/ECMFindModuleHelpers.cmake \
-      $sourceRoot/cmake/
-  '';
-
-  patches = [ ./fcitx-ecm.patch ];
-
   postPatch = ''
     substituteInPlace src/frontend/qt/CMakeLists.txt \
       --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
   '';
 
+  nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ];
+
   buildInputs = [
-    cmake enchant gettext isocodes pkgconfig intltool icu
-    libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2
-    dbus cairo gtk2 gtk3 pango qt4
+    enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
+    libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4
   ];
 
   cmakeFlags = ''
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index f10db80f71f3..be908b162c32 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.146";
+  version = "1.147";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "0lv77wl8vmjaish3v3gsaxb34hv8lcqarcm0mhl87ys37c1lr31x";
+    sha256 = "0nz1ymf9yn8aw2va7mhnzz2y5pf6r651sap8k09r92h1224i0wbj";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 14d1417e5a42..62f8d31ee7ea 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -6,7 +6,7 @@ buildRustPackage rec {
   name = "exa-${version}";
   version = "2016-04-20";
 
-  depsSha256 = "0dm8zaxy29pfbq68ysssab9i06sj4azgi3vib9617rklg7w3hdmk";
+  depsSha256 = "0nyrdl57nhr3lxqs3gaij3mdmlrm0z52qv6mznvgw0ziwqmlq5w1";
 
   src = fetchFromGitHub {
     owner = "ogham";
diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 289d57f88c06..e8f3ccf747d6 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.3";
+  version = "2.3.4";
   name = "logstash-${version}";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
-    sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b";
+    sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz";
   };
 
   dontBuild         = true;
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d6bb00eeb640..023498de371c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20160622";
+  name = "parallel-20160722";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1axng9bwapmb0vrrv67pp787gv7r5g02zyrfwnrhpxhi8zmm1jmg";
+    sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index d9c6c2630fa6..08bdb052d639 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,16 +1,21 @@
 { stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "cmst-2016.01.28";
+  name = "cmst-${version}";
+  version = "2016.04.03";
 
   src = fetchFromGitHub {
-    sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646";
-    rev    = name;
-    repo   = "cmst";
-    owner  = "andrew-bibb";
+    repo = "cmst";
+    owner = "andrew-bibb";
+    rev = name;
+    sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9";
   };
 
-  buildInputs = [ qtbase makeWrapper qmakeHook ];
+  nativeBuildInputs = [ makeWrapper qmakeHook ];
+
+  buildInputs = [ qtbase ];
+
+  enableParallelBuilding = true;
 
   preConfigure = ''
     substituteInPlace ./cmst.pro \
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f2e6117966f0..eaf427d61a36 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.47.1";
+  name = "curl-7.50.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx";
+    sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0";
   };
 
   outputs = [ "dev" "out" "bin" "man" "docdev" ];
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 4d66565406c2..9f933cc97090 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -36,12 +36,20 @@ stdenv.mkDerivation rec {
     ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd
     ln -s $out/agent/ddagent.py $out/bin/dd-forwarder
 
+    cat > $out/bin/dd-jmxfetch <<EOF
+    #!/usr/bin/env bash
+    exec ${python}/bin/python $out/agent/jmxfetch.py $@
+    EOF
+    chmod a+x $out/bin/dd-jmxfetch
+
     wrapProgram $out/bin/dd-forwarder \
       --prefix PYTHONPATH : $PYTHONPATH
     wrapProgram $out/bin/dd-agent \
       --prefix PYTHONPATH : $PYTHONPATH
     wrapProgram $out/bin/dogstatsd \
       --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/bin/dd-jmxfetch \
+      --prefix PYTHONPATH : $PYTHONPATH
 
     patchShebangs $out
   '';
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 985344616e92..3dadbeedd4df 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     maintainers = with maintainers; [ joachifm jgeerds ];
     # upstream claims OSX support, but Hydra fails
-    platforms = with platforms; allBut [ darwin ];
+    platforms = with platforms; allBut darwin;
   };
 }
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 548fc597e292..42f72ef7e368 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.0";
+  version = "7.0.2";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "15m0z3y3gxx30b980gym0mnc2icmdy2xy2ckcbmwp97ynm7pmzmp";
+    sha256 = "1xwblb1nvqq6gkxjynzsw31xja07qday58x5jqak8sp3d4lqw2h2";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index eb30ba2368a8..6b4c684834aa 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -6,12 +6,17 @@
 , libev ? null
 , libsodium ? null
 , udns ? null
+, asciidoc
+, xmlto
+, docbook_xml_dtd_45
+, docbook_xsl
+, libxslt
 }:
 
 let
 
-  version = "2.4.7";
-  sha256 = "957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed";
+  version = "2.4.8";
+  sha256 = "af3fc3be50fb24dfd1aed8ce34d2d13448735f6181269f54f4860438a1838472";
 
 in
 
@@ -24,7 +29,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  buildInputs = [ zlib ]
+  buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]
                 ++ optional (!withMbedTLS) openssl
                 ++ optional withMbedTLS mbedtls
                 ++ optional enableSystemSharedLib [libev libsodium udns];
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index e62cce9e4e3e..881362e4acb4 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.99.1";
+  version = "0.99.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "12nm4mxzx3qlbm65cadflzncjfkxdfqcp0lch29i5yfk4a8nhi71";
+    url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
+    sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
   };
 
   buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 1266e57e76f3..30ce33bd6a51 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -15,11 +15,11 @@ assert x11Support -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.13";
+  version = "2.1.14";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag";
+    sha256 = "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix
index f22966dca4a1..75886399fdc5 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/pkgs/tools/security/simple-tpm-pk11/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "simple-tpm-pk11-2014-09-25";
+  name = "simple-tpm-pk11-2016-07-12";
 
   src = fetchgit {
     url = "https://github.com/ThomasHabets/simple-tpm-pk11";
-    rev = "f26f10e11344560ff6e1479e6795dc0e5dc49a26";
-    sha256 = "0546lhxssngpkrhg5kmrvn4bm1s2kyd20kvhz3rfavfrvr72cs9k";
+    rev = "6f1f7a6b96ac82965e977cfecb88d930f1d70243";
+    sha256 = "06vf3djp29slh7hrh4hlh3npyl277fy7d77jv9mxa1sk1idjklxc";
   };
 
   buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ];
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 6e956b7a7780..4ede689bf972 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.5.3";
+  version = "0.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/vault";
@@ -11,6 +11,6 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "vault";
-    sha256 = "0px9l5zkvqawzsss70g58fx1anrx5zsdgxl6iplv0md111h0d87z";
+    sha256 = "0byb91nqrhl7w0rq0ilml1ybamh8w1qga47a790kggsmjhcj9ybx";
   };
 }
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
new file mode 100644
index 000000000000..4f798702101b
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2odt/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, lib, makeWrapper, fetchFromGitHub
+, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }:
+
+stdenv.mkDerivation rec {
+  version = "2014-12-17";
+  name = "pdf2odt-${version}";
+
+  src = fetchFromGitHub {
+    owner = "gutschke";
+    repo = "pdf2odt";
+    rev = "master";
+    sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r";
+  };
+
+  dontStrip = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  path = lib.makeBinPath [
+    bc
+    coreutils
+    file
+    gawk
+    ghostscript
+    gnused
+    imagemagick
+    zip
+  ];
+
+  patches = [ ./use_mktemp.patch ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc
+
+    install -m0755 pdf2odt $out/bin/pdf2odt
+    ln -rs $out/bin/pdf2odt $out/bin/pdf2ods
+
+    install -m0644 README.md LICENSE -t $out/share/doc
+
+    wrapProgram $out/bin/pdf2odt --prefix PATH : ${path}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PDF to ODT format converter";
+    homepage = http://github.com/gutschke/pdf2odt;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit version;
+  };
+}
diff --git a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch b/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
new file mode 100644
index 000000000000..1425aa5ae6a3
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
@@ -0,0 +1,19 @@
+diff --git a/pdf2odt b/pdf2odt
+index d38bb07..e1ddf05 100755
+--- a/pdf2odt
++++ b/pdf2odt
+@@ -173,13 +173,7 @@ if [ -e "${out}" ] &&
+ fi
+ 
+ # Set up temporary staging directory
+-TMPDIR="/tmp/pdf2odt.$$"
+-[ \! -e "${TMPDIR}" ] || {
+-  echo "Staging directory ${TMPDIR} already exists" >&2
+-  exit 1
+-}
+-trap 'rm -rf "${TMPDIR}"' EXIT INT TERM QUIT HUP
+-mkdir -p "${TMPDIR}"
++TMPDIR=$(mktemp -d)
+ 
+ # Adjust DPI so that the image fits on a letter- or a4-sized page.
+ function scale() {
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix
new file mode 100644
index 000000000000..25f12838be08
--- /dev/null
+++ b/pkgs/tools/typesetting/psutils/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "psutils-17";
+
+  src = fetchurl {
+    url = "ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz";
+    sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq";
+  };
+
+  configurePhase = ''
+    sed -e 's,/usr/local/bin/perl,${perl}/bin/perl,' \
+      -e "s,/usr/local,$out," \
+      Makefile.unix > Makefile
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Collection of useful utilities for manipulating PS documents";
+    homepage = http://knackered.knackered.org/angus/psutils/;
+    license = licenses.bsd3;
+  };
+}