Merge remote-tracking branch 'upstream/master' into HEAD

21 files changed, 390 insertions, 52 deletions

diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
new file mode 100644
index 00000000000..26bb32b17b0
--- /dev/null
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "oblogout-unstable-${version}";
+  version = "2009-11-18";
+
+  src = fetchFromGitHub {
+    owner = "nikdoof";
+    repo = "oblogout";
+    rev = "ee023158c03dee720a1af9b1307b14ed5a95f5a0";
+    sha256 = "0nj87q94idb5ki4wnb2xipfgc6k6clr3rmm4xxh46b58z4zhhbmj";
+  };
+
+  nativeBuildInputs = [ intltool file pythonPackages.distutils_extra ];
+
+  buildInputs = [ cairo ];
+
+  propagatedBuildInputs = [ pythonPackages.pygtk pythonPackages.pillow pythonPackages.dbus-python ];
+
+  patches = [ ./oblogout-0.3-fixes.patch ];
+
+  postPatch = ''
+    substituteInPlace data/oblogout --replace sys.prefix \"$out/${pythonPackages.python.sitePackages}\"
+    substituteInPlace oblogout/__init__.py --replace sys.prefix \"$out\"
+    mkdir -p $out/share/doc
+    cp -a README $out/share/doc
+  '';
+
+  meta = {
+    description = "Openbox logout script";
+    homepage = "https://launchpad.net/oblogout";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch b/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
new file mode 100644
index 00000000000..c58103c6d40
--- /dev/null
+++ b/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch
@@ -0,0 +1,66 @@
+diff --git a/data/oblogout b/data/oblogout
+index 8058c4a..dfe5285 100755
+--- a/data/oblogout
++++ b/data/oblogout
+@@ -77,8 +77,10 @@ def main(argv = None):
+             config = 'data/oblogout.conf'
+         elif os.path.isfile('%s/.config/oblogout.conf' % os.getenv("HOME")):
+             config = '%s/.config/oblogout.conf' % os.getenv("HOME")
+-        else:
++        elif os.path.isfile('/etc/oblogout.conf'):
+             config = '/etc/oblogout.conf'
++        else:
++            config = sys.prefix + '/etc/oblogout.conf'
+                 
+     # Check config in local path, if it exists pass it on     
+     if not os.path.isfile(config):
+diff --git a/data/oblogout.conf b/data/oblogout.conf
+index 810872c..b1c1009 100644
+--- a/data/oblogout.conf
++++ b/data/oblogout.conf
+@@ -1,11 +1,11 @@
+ [settings]
+-usehal = true
++usehal = false
+ 
+ [looks]
+ opacity = 70
+ bgcolor = black
+ buttontheme = simplistic
+-buttons = cancel, logout, restart, shutdown, suspend, lock
++buttons = cancel, logout, restart, shutdown, suspend
+ 
+ [shortcuts]
+ cancel = Escape
+@@ -17,11 +17,11 @@ lock = K
+ hibernate = H
+ 
+ [commands]
+-shutdown = shutdown -h now
+-restart = reboot
+-suspend = pmi action suspend
+-hibernate = pmi action hibernate
+-safesuspend = safesuspend
+-lock = gnome-screensaver-command -l
+-switchuser = gdm-control --switch-user
++shutdown = systemctl poweroff
++restart = systemctl reboot
++suspend = systemctl suspend
++hibernate = systemctl hibernate
++# safesuspend = safesuspend
++# lock = gnome-screensaver-command -l
++# switchuser = gdm-control --switch-user
+ logout = openbox --exit
+diff --git a/oblogout/__init__.py b/oblogout/__init__.py
+index b9e4e01..12f521f 100644
+--- a/oblogout/__init__.py
++++ b/oblogout/__init__.py
+@@ -138,7 +138,7 @@ class OpenboxLogout():
+             self.logger.debug("Rendering Fade")
+             # Convert Pixbuf to PIL Image
+             wh = (pb.get_width(),pb.get_height())
+-            pilimg = Image.fromstring("RGB", wh, pb.get_pixels())
++            pilimg = Image.frombytes("RGB", wh, pb.get_pixels())
+             
+             pilimg = pilimg.point(lambda p: (p * self.opacity) / 255 )
+ 
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 9d438dc84b3..bdfbbb1aa6d 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig
+{ stdenv, lib, fetchurl, pythonPackages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
 , ffmpeg, x264, libvpx, libwebp
-, libfakeXinerama }:
+, libfakeXinerama
+, gst_all_1, pulseaudioLight, gobjectIntrospection }:
+
+with lib;
 
 let
   inherit (pythonPackages) python cython buildPythonApplication;
@@ -26,11 +29,19 @@ in buildPythonApplication rec {
 
     ffmpeg libvpx x264 libwebp
 
+    gobjectIntrospection
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-libav
+
     makeWrapper
   ];
 
   propagatedBuildInputs = with pythonPackages; [
     pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
+    netifaces numpy websockify pygobject3 gst-python
   ];
 
   preBuild = ''
@@ -49,8 +60,10 @@ in buildPythonApplication rec {
       --set FONTCONFIG_FILE "${fontsConf}" \
       --set XPRA_LOG_DIR "\$HOME/.xpra" \
       --set XPRA_INSTALL_PREFIX "$out" \
+      --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
+      --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} \
   '';
 
   preCheck = "exit 0";
@@ -65,7 +78,7 @@ in buildPythonApplication rec {
   meta = {
     homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ tstrobel offline ];
   };
 }
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 3fe5b4b8d1a..3456f098648 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, cmake, alsaLib, udev, qt4 }:
+{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
+  qtsvg, qttools, makeQtWrapper }:
 
 let
-  version = "0.18.1";
+  version = "0.21.0";
 in
 
 stdenv.mkDerivation {
   name = "qastools-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qastools/qastools_${version}.tar.bz2";
-    sha256 = "1sac6a0j1881wgpv4491b2f4jnhqkab6xyldmcg1wfqb5qkdgzvg";
+    url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
+    sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh";
   };
 
   buildInputs = [
-    cmake alsaLib udev qt4
+    cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
   ];
 
   cmakeFlags = [
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
new file mode 100644
index 00000000000..d5f47f9a6c0
--- /dev/null
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, python2Packages  }:
+
+python2Packages.buildPythonApplication rec {
+  name     = "amazon-glacier-cmd-interface-${version}";
+  version  = "2016-09-01";
+
+  src = fetchFromGitHub {
+    owner  = "uskudnik";
+    repo   = "amazon-glacier-cmd-interface";
+    rev    = "9f28132f9872e1aad9e956e5613b976504e930c8";
+    sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
+  };
+
+  propagatedBuildInputs = with python2Packages; [
+    argparse
+    boto
+    dateutil
+    prettytable
+    pytz
+  ];
+
+  meta = {
+    description = "Command line interface for Amazon Glacier";
+    homepage    = https://github.com/uskudnik/amazon-glacier-cmd-interface;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lovek323 ];
+  };
+
+}
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 4201fb25f98..f466da91dff 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez }:
+{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }:
 
 assert alsaSupport -> alsaLib != null;
+assert systemdSupport -> systemd != null;
 
 stdenv.mkDerivation rec {
-  name = "brltty-5.2";
+  name = "brltty-5.4";
   
   src = fetchurl {
     url = "http://brltty.com/archive/${name}.tar.gz";
-    sha256 = "1zaab5pxkqrv081n23p3am445d30gk0km4azqdirvcpw9z15q0cz";
+    sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l";
   };
+
+  patches = [ ./systemd.patch ];
   
-  buildInputs = [ pkgconfig alsaLib bluez ]
-    ++ stdenv.lib.optional alsaSupport alsaLib;
+  buildInputs = [ pkgconfig bluez ]
+    ++ stdenv.lib.optional alsaSupport alsaLib
+    ++ stdenv.lib.optional systemdSupport systemd;
   
   meta = {
     description = "Access software for a blind person using a braille display";
@@ -27,7 +31,9 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
   
-  patchPhase = ''
+  preConfigurePhases = [ "preConfigure" ];
+
+  preConfigure = ''
     substituteInPlace configure --replace /sbin/ldconfig ldconfig
   '';
 }
diff --git a/pkgs/tools/misc/brltty/systemd.patch b/pkgs/tools/misc/brltty/systemd.patch
new file mode 100644
index 00000000000..24a0d617b30
--- /dev/null
+++ b/pkgs/tools/misc/brltty/systemd.patch
@@ -0,0 +1,22 @@
+diff --git a/config.mk.in b/config.mk.in
+index 5093b9c..b707bd4 100644
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
+ ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
+ BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
+ OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
+-PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
++PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
+ 
+ CC = @CC@
+ CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
+@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
+ 
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+-LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
++LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@
+ 
+ MKOBJ = @MKOBJ@
+ MKMOD = @MKMOD@
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
new file mode 100644
index 00000000000..ddc030bcf8d
--- /dev/null
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "0.4.6";
+  name = "kargo-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/k/kargo/${name}.tar.gz";
+    sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = with pythonPackages; [
+    ansible2
+    boto
+    cffi
+    cryptography
+    libcloud
+    markupsafe
+    netaddr
+    pyasn1
+    requests2
+    setuptools
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubespray/kargo-cli;
+    description = "A tool helps to deploy a kubernetes cluster with Ansible.";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 6b49a8120a4..005915080af 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.19";
+  version = "2016.10.25";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "ed8d4a247c4cfffe2a1171b4f9c20be19e84d96bcf3716f46988c8503b1b7713";
+    sha256 = "920048c6ff2f7f2c4b55c1ba4810e85f76efd814118e59b3568bdc2c38024697";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 642c4a9fbca..5a29657bd5b 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -3,12 +3,12 @@
 pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "httpstat";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchFromGitHub {
       owner = "reorx";
       repo = pname;
       rev = "${version}";
-      sha256 = "1zfbv3fz3g3wwvsgrcyrk2cp7pjhkpf7lmx57ry9b43c62gcd7yh";
+      sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
     };
     doCheck = false; # No tests
     buildInputs = [ glibcLocales ];
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
new file mode 100644
index 00000000000..ca1846edb04
--- /dev/null
+++ b/pkgs/tools/networking/kea/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus
+, boost, python3, postgresql, mysql, gmp, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "kea";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+    sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3";
+  };
+
+  patches = [ ./dont-create-var.patch ];
+
+  postPatch = ''
+    substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc"
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-botan-config=${botan}/bin/botan-config-1.10"
+    "--with-dhcp-pgsql=${postgresql}/bin/pg_config"
+    "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [
+    openssl log4cplus boost python3 mysql.client
+    botan gmp bzip2
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://kea.isc.org/;
+    description = "High-performance, extensible DHCP server by ISC";
+    longDescription = ''
+      KEA is a new open source DHCPv4/DHCPv6 server being developed by
+      Internet Systems Consortium. The objective of this project is to
+      provide a very high-performance, extensible DHCP server engine for
+      use by enterprises and service providers, either as is or with
+      extensions and modifications.
+    '';
+    license = licenses.mpl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch
new file mode 100644
index 00000000000..595942673c6
--- /dev/null
+++ b/pkgs/tools/networking/kea/dont-create-var.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.am b/Makefile.am
+index 897be34..b146729 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -103,11 +103,6 @@ cppcheck:
+ 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
+ 		src
+ 
+-# These steps are necessary during installation
+-install-exec-hook:
+-	mkdir -p $(DESTDIR)${localstatedir}/log/
+-	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+-
+ EXTRA_DIST  = tools/path_replacer.sh
+ EXTRA_DIST += tools/mk_cfgrpt.sh
+ 
+diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
+index 066b410..16d3135 100755
+--- a/src/lib/dhcpsrv/Makefile.am
++++ b/src/lib/dhcpsrv/Makefile.am
+@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox
+ # Specification file
+ EXTRA_DIST += logging.spec
+ 
+-install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
+-
+-
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 23b0d241d17..d7b7fcb2fdc 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.7.1";
+  name = "lftp-4.7.3";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv";
+    sha256 = "06jmc9x86ga67yyx7655zv96gfv1gdm955a7g4afd3bwf6bzfxac";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnutls readline zlib libidn ];
+  buildInputs = [ gnutls readline zlib libidn gmp libiconv ];
 
   configureFlags = [
     "--with-readline=${readline.dev}"
   ];
 
+  postPatch = ''
+    substituteInPlace src/lftp_rl.c --replace 'history.h' 'readline/history.h'
+  '';
+
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";
     homepage = http://lftp.yar.ru/;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch
new file mode 100644
index 00000000000..98c1308e4db
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/PppdPath.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index 89a7add..ae99eb4 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self,
+ 
+ 	g_return_val_if_fail (setting != NULL, NULL);
+ 
+-	pppd_binary = nm_utils_find_helper ("pppd", NULL, err);
++	pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err);
+ 	if (!pppd_binary)
+ 		return NULL;
+ 
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 608b9ea17fe..d96bc08495f 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
     "--with-libsoup=yes"
   ];
 
+  patches = [ ./PppdPath.patch ];
+
   buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
                   bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
 
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 1443c9bfb7d..4362dc57e68 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990";
+    sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";
     license = licenses.bsd3;
-    homepage = http://www.unbound.net;
+    homepage = https://www.unbound.net;
     maintainers = with maintainers; [ ehmry fpletz ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 34042d802cc..a6328a2140e 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     readline libusb gnutls adns openldap zlib bzip2
   ];
 
+  patches = [ ./fix-libusb-include-path.patch ];
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
new file mode 100644
index 00000000000..18c4f110738
--- /dev/null
+++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -8872,7 +8872,7 @@
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
+ $as_echo_n "checking libusb include dir... " >&6; }
+    usb_incdir_found="no"
+-   for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
++   for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
+      _libusb_save_cppflags=$CPPFLAGS
+      if test -n "${_incdir}"; then
+        CPPFLAGS="-I${_incdir} ${CPPFLAGS}"
diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
index c9de63a320b..74e466069d9 100644
--- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
+++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
@@ -1,35 +1,57 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 16393a8..3991d2a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -219,18 +219,18 @@ IF(NOT WIN32)
-   # Install Nitrokey udev rules
+@@ -251,23 +251,23 @@
+       #      ${CMAKE_SOURCE_DIR}/data/icons/48x48
+       #      ${CMAKE_SOURCE_DIR}/data/icons/128x128
+     ${CMAKE_SOURCE_DIR}/data/icons/
+-    DESTINATION usr/share/icons/
++    DESTINATION share/icons/
+   )
+ 
    install(FILES
-     ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
--    DESTINATION /etc/udev/rules.d
-+    DESTINATION etc/udev/rules.d
+     ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
+-    DESTINATION usr/share/applications
++    DESTINATION share/applications
    )
  
-   # Install autocompletion scripts
    install(FILES
-     ${CMAKE_SOURCE_DIR}/data//bash-autocomplete/nitrokey-app
--    DESTINATION /etc/bash_completion.d
-+    DESTINATION etc/bash_completion.d
+     ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
+-    DESTINATION usr/share/pixmaps
++    DESTINATION share/pixmaps
+   )
+ 
+   # Install Nitrokey udev rules
+   install(FILES
+    ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
+-   DESTINATION usr/lib/udev/rules.d
++   DESTINATION lib/udev/rules.d
    )
  
+   # Install autocompletion scripts
+@@ -278,7 +278,7 @@
+ 
    install(FILES
-     ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
--    DESTINATION /usr/share/locale/de_DE/LC_MESSAGES
-+    DESTINATION share/locale/de_DE/LC_MESSAGES
+    ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
+-   DESTINATION usr/share/locale/de_DE/LC_MESSAGES
++   DESTINATION share/locale/de_DE/LC_MESSAGES
    )
  
    install(FILES
-@@ -238,7 +238,7 @@ IF(NOT WIN32)
+@@ -286,7 +286,7 @@
      ${CMAKE_SOURCE_DIR}/images/quit.png
      ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
      ${CMAKE_SOURCE_DIR}/images/settings.png
--    DESTINATION /usr/share/nitrokey
+-    DESTINATION usr/share/nitrokey
 +    DESTINATION share/nitrokey
    )
  
  ENDIF () # NOT WIN32
+@@ -299,7 +299,7 @@
+   ${resources_ouput}
+ )
+ 
+-INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
++INSTALL(TARGETS nitrokey-app DESTINATION bin)
+ 
+ TARGET_LINK_LIBRARIES(nitrokey-app
+   ${QT_LIBRARIES}
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 38e083ba131..91d5e75272b 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, cmake, fetchFromGitHub, libappindicator-gtk2, libnotify, libusb1, pkgconfig
-, qt5 }:
+{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "nitrokey-app";
-  version = "0.4";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "0h131847pllsr7rk7nn8vlj74byb5f14cl9h3g3pmlq5zj8ylfkx";
+    sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
   };
 
   buildInputs = [
     cmake
-    libappindicator-gtk2
-    libnotify
     libusb1
     pkgconfig
     qt5.qtbase
@@ -24,6 +21,7 @@ stdenv.mkDerivation rec {
      ./FixInstallDestination.patch
      ./HeaderPath.patch
   ];
+  cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
   meta = {
     description      = "Provides extra functionality for the Nitrokey Pro and Storage";
     longDescription  = ''
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index b31d60247d8..b430fd8aad0 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.18";
+  name = "sudo-1.8.18p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "04xywg2f9x2kfw81abdf8gsraldaz5v0w0x2zi8aqlgsjygfj6c5";
+    sha256 = "0d4l6y03khmzdd8vhfnq8lrb8gcxplzf7gav0a9sd08jf8f4g875";
   };
 
   configureFlags = [