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

2016-02-19 21:16:14 +00:00
parent ea84b3a915 5ea21d69f5
commit bc21db3692
308 changed files with 13223 additions and 4459 deletions
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

    wrapProgram $out/bin/kpcli --set PERL5LIB \
      "${with perlPackages; stdenv.lib.makePerlPath [
-         Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
+         CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
      ]}"
  '';