Merge branch 'master' into staging

... to get the systemd update (rebuilding ~7k jobs).

18 files changed, 233 insertions, 117 deletions

diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 89e49c9586c5..f3f8877db2c9 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, fuse, curl, expat }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, fuse, curl, expat }:
   
 stdenv.mkDerivation rec {
-  name = "s3backer-1.3.1";
+  name = "s3backer-${version}";
+  version = "1.4.2";
   
-  src = fetchurl {
-    url = "http://s3backer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1dmdvhb7mcn0fdcljpdyvfynhqrsnrg50dgl1706i8f1831lgk1r";
+  src = fetchFromGitHub {
+    sha256 = "0b9vmykrfpzs9is31pqb8xvgjraghnax1ph2jkbib1ya0vhxm8dj";
+    rev = version;
+    repo = "s3backer";
+    owner = "archiecobbs";
   };
 
-  buildInputs = [ pkgconfig fuse curl expat ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fuse curl expat ];
 
-  meta = {
+  autoreconfPhase = ''
+    patchShebangs ./autogen.sh
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/s3backer/;
     description = "FUSE-based single file backing store via Amazon S3";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
new file mode 100644
index 000000000000..acd377441e2c
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-cloudpinyin-${version}";
+  version = "0.3.4";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz";
+    sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1";
+  };
+
+  buildInputs = [ cmake pkgconfig fcitx gettext curl ];
+
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace po/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    description  = "A standalone module for fcitx that uses web API to provide better pinyin result";
+    homepage     = https://github.com/fcitx/fcitx-cloudpinyin;
+    license      = licenses.gpl3Plus;
+    platforms    = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch
new file mode 100644
index 000000000000..8fe100dd3b24
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch
@@ -0,0 +1,29 @@
+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 ab139bdb5a76..fc9dd1e6a253 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fcitx, extra-cmake-modules, qtbase }:
+{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
@@ -9,7 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";
   };
 
-  buildInputs = [ cmake fcitx extra-cmake-modules qtbase ];
+  # 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 ];
+
+  buildInputs = [ cmake fcitx pkgconfig qtbase ];
 
   preInstall = ''
     substituteInPlace platforminputcontext/cmake_install.cmake \
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 96423cf46e6d..8e086f7386f5 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,9 +1,9 @@
-{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
+{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, qt55 }:
 
 symlinkJoin {
   name = "fcitx-with-plugins-${fcitx.version}";
 
-  paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins;
+  paths = [ fcitx fcitx-configtool qt55.fcitx-qt5 ] ++ plugins;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index 000f6cd0f93f..0367ab53835f 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dtach-0.8";
+  name = "dtach-${version}";
+  version = "0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dtach/dtach/0.8/dtach-0.8.tar.gz";
-    sha256 = "16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9";
+    url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz";
+    sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
   };
 
-  patches = [ ./fix-CVE-2012-3368.patch ];
-
   installPhase = ''
     mkdir -p $out/bin
     cp dtach $out/bin/dtach
@@ -19,12 +18,14 @@ stdenv.mkDerivation rec {
     homepage = http://dtach.sourceforge.net/;
     description = "A program that emulates the detach feature of screen";
 
-    longDescription = ''dtach is a tiny program that emulates the
-      detach feature of screen, allowing you to run a program in an
-      environment that is protected from the controlling terminal and
-      attach to it later. dtach does not keep track of the contents of
-      the screen, and thus works best with programs that know how to
-      redraw themselves.'';
+    longDescription = ''
+      dtach is a tiny program that emulates the detach feature of
+      screen, allowing you to run a program in an environment that is
+      protected from the controlling terminal and attach to it later.
+      dtach does not keep track of the contents of the screen, and
+      thus works best with programs that know how to redraw
+      themselves.
+    '';
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch b/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch
deleted file mode 100644
index 9e556d9325fb..000000000000
--- a/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fix error handling for read from stdin in attach.c
-
-attach.c did not correctly handle a read from stdin when read returned
-an error. The code assigned the return value of read to pkt.len (an
-unsigned char) before checking the value. This prevented the error check
-from working correctly, since an unsigned integer can never be < 0.
-
-A packet with an invalid length was then sent to the master, which then
-sent 255 bytes of garbage to the program.
-
-Fix the bug in attach.c and the unchecked packet length bug in master.c.
-
-Report and initial patch by Enrico Scholz.
-
---- a/master.c	2012/07/01 21:26:10	1.14
-+++ b/master.c	2012/07/01 21:44:34	1.15
-@@ -351,7 +351,10 @@
- 
- 	/* Push out data to the program. */
- 	if (pkt.type == MSG_PUSH)
--		write(the_pty.fd, pkt.u.buf, pkt.len);
-+	{
-+		if (pkt.len <= sizeof(pkt.u.buf))
-+			write(the_pty.fd, pkt.u.buf, pkt.len);
-+	}
- 
- 	/* Attach or detach from the program. */
- 	else if (pkt.type == MSG_ATTACH)
---- a/attach.c	2012/07/01 21:26:10	1.12
-+++ b/attach.c	2012/07/01 21:44:34	1.13
-@@ -237,12 +237,16 @@
- 		/* stdin activity */
- 		if (n > 0 && FD_ISSET(0, &readfds))
- 		{
-+			ssize_t len;
-+
- 			pkt.type = MSG_PUSH;
- 			memset(pkt.u.buf, 0, sizeof(pkt.u.buf));
--			pkt.len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
-+			len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
- 
--			if (pkt.len <= 0)
-+			if (len <= 0)
- 				exit(1);
-+
-+			pkt.len = len;
- 			process_kbd(s, &pkt);
- 			n--;
- 		}
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index d77b7ff48128..825921327e16 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,19 +1,24 @@
 { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
- 
+
 stdenv.mkDerivation rec {
   name = "man-db-2.7.5";
-  
+
   src = fetchurl {
     url = "mirror://savannah/man-db/${name}.tar.xz";
     sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw";
   };
-  
-  buildInputs = [ pkgconfig libpipeline db groff ];
+
+  outputs = [ "out" "doc" ];
+  outputMan = "out"; # users will want `man man` to work
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpipeline db groff ];
 
   configureFlags = [
     "--disable-setuid"
-    "--sysconfdir=/etc"
     "--localstatedir=/var"
+    # Don't try /etc/man_db.conf by default, so we avoid error messages.
+    "--with-config-file=\${out}/etc/man_db.conf"
     "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
     "--with-eqn=${groff}/bin/eqn"
     "--with-neqn=${groff}/bin/neqn"
@@ -23,15 +28,9 @@ stdenv.mkDerivation rec {
     "--with-tbl=${groff}/bin/tbl"
   ];
 
-  installFlags = [ "DESTDIR=\${out}" ];
+  enableParallelBuilding = true;
 
-  postInstall = ''
-    mv $out/$out/* $out
-    DIR=$out/$out
-    while rmdir $DIR 2>/dev/null; do
-      DIR="$(dirname "$DIR")"
-    done
-  '';
+  doCheck = true;
 
   meta = with stdenv.lib; {
     homepage = "http://man-db.nongnu.org";
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 9b1b3f48450c..bd446395bc78 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/multitail/;
     description = "tail on Steroids";
     maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index d290c9f9a5a7..1e39ddf481bc 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,11 +1,19 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils
+{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils
 , kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
 , enableRDW ? false, networkmanager
 }:
 
-let version = "0.8";
-in stdenv.mkDerivation {
+let
+  paths = lib.makeBinPath
+          ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
+             x86_energy_perf_policy gawk gnugrep coreutils
+           ]
+           ++ lib.optional enableRDW networkmanager
+          );
+
+in stdenv.mkDerivation rec {
   name = "tlp-${version}";
+  version = "0.8";
 
   src = fetchFromGitHub {
         owner = "linrunner";
@@ -26,20 +34,19 @@ in stdenv.mkDerivation {
 
   buildInputs = [ perl ];
 
-  paths = lib.makeBinPath
-          ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
-             x86_energy_perf_policy gawk gnugrep coreutils
-           ]
-           ++ lib.optional enableRDW networkmanager
-          );
-
   installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw";
 
   postInstall = ''
     for i in $out/bin/* $out/lib/udev/tlp-*; do
       sed -i "s,/usr/lib/,$out/lib/,g" "$i"
-      wrapProgram "$i" \
-        --prefix PATH : "$paths"
+      if [[ "$(basename "$i")" = tlp-*list ]]; then
+        # Perl script; use wrapProgram
+        wrapProgram "$i" \
+          --prefix PATH : "${paths}"
+      else
+        # Bash script
+        sed -i '2iexport PATH=${paths}:$PATH' "$i"
+      fi
     done
 
     for i in $out/lib/udev/rules.d/*; do
@@ -51,9 +58,10 @@ in stdenv.mkDerivation {
     done
   '' + lib.optionalString enableRDW ''
     for i in $out/etc/NetworkManager/dispatcher.d/*; do
-      sed -i "s,/usr/lib/,$out/lib/,g" "$i"
-      wrapProgram "$i" \
-        --prefix PATH : "$paths"
+      sed -i \
+        -e "s,/usr/lib/,$out/lib/,g" \
+        -e '2iexport PATH=${paths}:$PATH' \
+        "$i"
     done
   '';
 
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 0cf7f92912ed..4bf195977094 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -3,13 +3,12 @@
 # Packaging documentation at:
 # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
 pythonPackages.buildPythonApplication rec {
-  version = "0.10.0";
+  version = "0.11.0";
   name = "vdirsyncer-${version}";
-  namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/0b/fb/c42223e1e9169e4770194e62143d431755724b080d8cb77f14705b634815/vdirsyncer-0.10.0.tar.gz";
-    sha256 = "1gf86sbd6w0w4zayh9r3irlp5jwrzbjikjc0vs5zkdpa5c199f78";
+    url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
+    sha256 = "1bf0vk29qdswar0q4267aamfriq3134302i2p3qcqxpmmcwx3qfv";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
new file mode 100644
index 000000000000..b78eb910f938
--- /dev/null
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -0,0 +1,47 @@
+{ stdenv, pkgs, fetchFromGitHub, buildPythonPackage,
+  pexpect,
+  pyGtkGlade,
+  pygobject,
+  pyxdg,
+  gnome_python,
+}:
+buildPythonPackage rec {
+  version = "1.1.1";
+  name = "xflux-gui-${version}";
+
+  src = fetchFromGitHub {
+    repo = "xflux-gui";
+    owner = "xflux-gui";
+    rev = "d897dfd";
+    sha256 = "1mx1r2hz3g3waafn4w8hql0gaasfizbzz60bk5llw007k4k8892r";
+  };
+
+  # remove messing with shipped binary
+  patches = [ ./setup.patch ];
+
+  # not sure if these need to be propogated or not?
+  propagatedBuildInputs = [
+    pexpect
+    pyGtkGlade
+    pygobject
+    pyxdg
+    pkgs.libappindicator-gtk2
+    gnome_python
+  ];
+
+  buildInputs = [
+    pkgs.xflux
+  ];
+
+  postPatch = ''
+     substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${pkgs.xflux}/bin/xflux\""
+  '';
+
+  meta = {
+    description = "Better lighting for Linux. Open source GUI for xflux";
+    homepage = https://justgetflux.com/linux.html;
+    license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary
+    maintainers = [ stdenv.lib.maintainers.sheenobu ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/xflux/setup.patch b/pkgs/tools/misc/xflux/setup.patch
new file mode 100644
index 000000000000..c36f81f7d808
--- /dev/null
+++ b/pkgs/tools/misc/xflux/setup.patch
@@ -0,0 +1,28 @@
+diff --git a/setup.py b/setup.py
+index e11f199..b1cb0e5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,13 +4,6 @@ from distutils.core import setup
+ from sys import maxsize
+ from os import rename
+ 
+-# Determines which is the appropriate executable for 32-bit
+-if maxsize == 2147483647:
+-    rename("xflux32", "xflux")
+-# ... or 64-bit processors
+-elif maxsize == 9223372036854775807:
+-    rename("xflux64", "xflux")
+-
+ setup(name = "f.lux indicator applet",
+     version = "1.1.8",
+     description = "f.lux indicator applet - better lighting for your computer",
+@@ -22,8 +15,7 @@ setup(name = "f.lux indicator applet",
+     packages = ["fluxgui",],
+     package_data = {"fluxgui" : ["*.glade"] },
+     data_files=[('share/icons/hicolor/scalable/apps', ['fluxgui.svg', 'fluxgui-light.svg', 'fluxgui-dark.svg']),
+-            ('share/applications', ['desktop/fluxgui.desktop']),
+-            ('bin', ['xflux']),],
++            ('share/applications', ['desktop/fluxgui.desktop']),],
+     scripts = ["fluxgui"],
+     long_description = """f.lux indicator applet is an indicator applet to
+     control xflux, an application that makes the color of your computer's
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 1a040652ff4e..a2204f9664a1 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, makeWrapper,
   pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
-  bash, iproute, iptables, procps, coreutils, gnused, gawk, nssTools, which, python,
+  bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python,
   docs ? false, xmlto
   }:
 
 let
   optional = stdenv.lib.optional;
-  version = "3.16";
+  version = "3.17";
   name = "libreswan-${version}";
   binPath = stdenv.lib.makeBinPath [
-    bash iproute iptables procps coreutils gnused gawk nssTools which python
+    bash iproute iptables procps coreutils gnused gawk nss.tools which python
   ];
 in
 
@@ -21,12 +21,12 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.libreswan.org/${name}.tar.gz";
-    sha256 = "15qv4101p1jw591l04gsfscb3farzd278mgi8yph015vmifyjxrd";
+    sha256 = "00qd1n6f5w4xr06yanfpnbnn7y7rq2m878ifa3hh13bdgzsqdhi8";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
-                  libcap_ng curl nspr nssTools python ]
+                  libcap_ng curl nspr nss python ]
                 ++ optional docs xmlto;
 
   prePatch = ''
diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix
index b5fc484e6b1c..6f5552782190 100644
--- a/pkgs/tools/networking/mailsend/default.nix
+++ b/pkgs/tools/networking/mailsend/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="mailsend";
-    version="1.18";
+    version="1.19";
     name="${baseName}-${version}";
-    hash="1fjrb6q7y2dxx0qz7r0wlhqfkjqq1vfh7yb7jl77h5qi5kd5rm46";
-    url="https://github.com/muquit/mailsend/archive/1.18.tar.gz";
-    sha256="1fjrb6q7y2dxx0qz7r0wlhqfkjqq1vfh7yb7jl77h5qi5kd5rm46";
+    hash="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn";
+    url="https://github.com/muquit/mailsend/archive/1.19.tar.gz";
+    sha256="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn";
   };
   buildInputs = [
     openssl
diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
index 90f686f77ea6..90f686f77ea6 100644
--- a/pkgs/tools/networking/oslrd/default.nix
+++ b/pkgs/tools/networking/olsrd/default.nix
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1e8b1a1b299f..1e00157c4874 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -4,11 +4,12 @@
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
-  name = "strongswan-5.3.2";
+  name = "strongswan-${version}";
+  version = "5.4.0";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "09gjrd5f8iykh926y35blxlm2hlzpw15m847d8vc9ga29s6brad4";
+    sha256 = "12dy7dfwblihrc2zs0fdvyimvgi2g5mvgh0ksjkxi73axam8ya7q";
   };
 
   dontPatchELF = true;
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 3a88267f6c4f..44e249102965 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.1";
+  version = "1.5.2";
   name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "0lhjxlha4j5rx11d81y1rgp9j18rlpxsjc0flsmj6bm60awmm627";
+    sha256 = "0xgfwk6lxwwzq8pbyxjl5xxpybs9p4qwgb7q0ykf048xwxha4kvk";
   };
 
   buildInputs = [ libgcrypt readline ];