Merge branch 'master' into staging-next

39 files changed, 261 insertions, 105 deletions

diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
new file mode 100644
index 000000000000..8f521ed36d09
--- /dev/null
+++ b/pkgs/tools/admin/clair/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, rpm, xz }:
+
+buildGoPackage rec {
+  pname = "clair";
+  version = "2.0.7";
+
+  goPackagePath = "github.com/coreos/clair";
+
+  src = fetchFromGitHub {
+    owner = "coreos";
+    repo = "clair";
+    rev = "v${version}";
+    sha256 = "0n4pxdw71hd1rxzgf422fvycpjkrxxnvcidys0hpjy7gs88zjz5x";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/clair \
+      --prefix PATH : "${lib.makeBinPath [ rpm xz ]}"
+  '';
+
+  meta = with lib; {
+    description = "Vulnerability Static Analysis for Containers";
+    homepage = https://github.com/coreos/clair;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 57896fd7f637..bd6317bcea19 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "pasystray-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
     rev = name;
-    sha256 = "0cc9hjyw4gr4ip4lw74pzb1l9sxs3ffhf0xn0m1fhmyfbjyixwkh";
+    sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
new file mode 100644
index 000000000000..515fdd4e2608
--- /dev/null
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, lib, autoreconfHook, pkgconfig, fuse3 }:
+
+let
+  version = "0.2";
+in
+  pkgs.stdenv.mkDerivation {
+    name = "fuse-overlayfs-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "containers";
+      repo = "fuse-overlayfs";
+      rev = "1e2b65baa2f75eea0e4bab90b5ac81dd8471256c";
+      sha256 = "0a9ix8rqjs5r28jsriyiv4yq7iilmv69x05kf23s1ihzrvrfkl08";
+    };
+
+    nativeBuildInputs = [ autoreconfHook pkgconfig ];
+    buildInputs = [ fuse3 ];
+
+    meta = with lib; {
+      homepage = https://github.com/containers/fuse-overlayfs;
+      description = "FUSE implementation for overlayfs";
+      longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers.";
+      license = licenses.gpl3;
+      platforms = platforms.unix;
+      maintainers = [ maintainers.ma9e ];
+    };
+  }
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 0438b9c38e4b..c1d41ff1622c 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "go-mtpfs-${version}";
-  version = "20150917-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
+  version = "2018-02-09";
+  rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
 
   goPackagePath = "github.com/hanwen/go-mtpfs";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/hanwen/go-mtpfs";
-    sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
+    sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix
index 4bba3f237392..f558a53f7d2d 100644
--- a/pkgs/tools/filesystems/go-mtpfs/deps.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/deps.nix
@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/hanwen/go-fuse";
     fetch = {
       type = "git";
       url = "https://github.com/hanwen/go-fuse";
-      rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e";
-      sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56";
+      rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef";
+      sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc";
     };
   }
   {
@@ -17,4 +18,13 @@
       sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
     };
   }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf";
+      sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin";
+    };
+  }
 ]
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 389a614f54b0..2fd3d52bdf67 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchFromGitHub, zlib, xz
 , lz4 ? null
 , lz4Support ? false
+, zstd
 }:
 
 assert lz4Support -> (lz4 != null);
 
 stdenv.mkDerivation rec {
-  name = "squashfs-4.4dev";
+  name = "squashfs-${version}";
+  version = "4.4dev_20180612";
 
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
-    sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks";
-    rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d";
+    sha256 = "1y53z8dkph3khdyhkmkmy0sg9p1n8czv3vj4l324nj8kxyih3l2c";
+    rev = "6e242dc95485ada8d1d0b3dd9346c5243d4a517f";
   };
 
   patches = [
@@ -28,14 +30,14 @@ stdenv.mkDerivation rec {
     ./squashfs-tools-4.3-4k-align.patch
   ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
-  buildInputs = [ zlib xz ]
+  buildInputs = [ zlib xz zstd ]
     ++ stdenv.lib.optional lz4Support lz4;
 
   preBuild = "cd squashfs-tools";
 
   installFlags = "INSTALL_DIR=\${out}/bin";
 
-  makeFlags = [ "XZ_SUPPORT=1" ]
+  makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ]
     ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
 
   meta = {
diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch
index b7c949182e0b..cd4308b489fe 100644
--- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch
+++ b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch
@@ -27,11 +27,12 @@ index 8b1376f..683973d 100644
  int use_regex = FALSE;
  int nopad = FALSE;
  int exit_on_error = FALSE;
+ static off_t squashfs_start_offset = 0;
 +int do_4k_align = FALSE;
 +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1))
- 
+
  long long global_uid = -1, global_gid = -1;
- 
+
 @@ -1513,6 +1515,9 @@ void unlock_fragments()
  	 * queue at this time.
  	 */
@@ -40,7 +41,7 @@ index 8b1376f..683973d 100644
 +		if(do_4k_align)
 +			ALIGN_UP(bytes, 4096);
  		write_buffer = queue_get(locked_fragment);
- 		frg = write_buffer->block;	
+ 		frg = write_buffer->block;
  		size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size);
 @@ -2420,6 +2420,9 @@
  	compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
@@ -55,18 +56,18 @@ index 8b1376f..683973d 100644
 @@ -2761,6 +2769,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent,
  	long long sparse = 0;
  	struct file_buffer *fragment_buffer = NULL;
- 
+
 +	// 4k align the start of each file.
 +	if(do_4k_align)
 +		ALIGN_UP(bytes, 4096);
 +
  	if(pre_duplicate(read_size))
  		return write_file_blocks_dup(inode, dir_ent, read_buffer, dup);
- 
+
 @@ -4692,6 +4704,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad)
  		"compressed", no_fragments ? "no" : noF ? "uncompressed" :
  		"compressed", no_xattrs ? "no" : noX ? "uncompressed" :
- 		"compressed");
+ 		"compressed", noI || noId ? "uncompressed" : "compressed");
 +	printf("\t4k %saligned\n", do_4k_align ? "" : "un");
  	printf("\tduplicates are %sremoved\n", duplicate_checking ? "" :
  		"not ");
@@ -88,5 +89,5 @@ index 8b1376f..683973d 100644
  			ERROR("\nFilesystem filter options:\n");
  			ERROR("-p <pseudo-definition>\tAdd pseudo file "
  				"definition\n");
--- 
+--
 2.14.1.480.gb18f417b89-goog (previously; hand-patched by charles-dyfis-net)
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix
index 333714182177..ebfb211732e8 100644
--- a/pkgs/tools/filesystems/svnfs/default.nix
+++ b/pkgs/tools/filesystems/svnfs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
-  NIX_LDFLAGS="-lsvn_client-1";
+  NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1";
 
   meta = {
     description = "FUSE filesystem for accessing Subversion repositories";
diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
index a4a2cfc1a7c4..42ccc4d5022e 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }:
+{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
 
 /*  how to calibrate your monitor:
     Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
 */
 stdenv.mkDerivation {
   name = "lprof-1.11.4.1";
-  nativeBuildInputs = [ scons ];
+  nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
   buildInputs = [ qt3 lcms1 libtiff vigra ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 01b092ef2a61..5699a7931dbc 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -10,7 +10,7 @@ let
   };
 in clangStdenv.mkDerivation rec {
   name = "ibus-mozc-${version}";
-  version = "2.20.2673.102";
+  version = "2.23.2815.102";
 
   meta = with clangStdenv.lib; {
     isIbusEngine = true;
@@ -27,8 +27,8 @@ in clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner  = "google";
     repo   = "mozc";
-    rev    = "280e38fe3d9db4df52f0713acf2ca65898cd697a";
-    sha256 = "0s599f817gjgqynm4n1yll1ipd25ai2c55y8k6wvhg9s7qaxnyhs";
+    rev    = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
+    sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
   };
 
   postUnpack = ''
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index fe574b4f8d43..50ee066d96a2 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,17 +2,17 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
-  version = "2.5.1";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "19l3b1fqg1n3ch484dcibbi5a3nbmjq086has5pwqn348h4k57mh";
+    sha256 = "1hxgzqh5z81dq1k2xd6329h8idk9y8q29izrwm1vhn0m9v1pxa22";
   };
 
-  checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];
-  propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ];
+  checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ];
+  propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa ];
 
   meta = with stdenv.lib; {
     description = "ESP8266 and ESP32 serial bootloader utility";
diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
new file mode 100644
index 000000000000..6787549e053b
--- /dev/null
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name    = "hexyl-${version}";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner  = "sharkdp";
+    repo   = "hexyl";
+    rev    = "v${version}";
+    sha256 = "138w6czi62dpw6gcd3yqpk7lns7m89kwbgm1d1i5lnzsqck3wb4s";
+  };
+
+  cargoSha256 = "01m8n7yl3yqr8kj0dl1wfaz724da17hs3sb1fbncv64l6qpvdka1";
+
+  meta = with stdenv.lib; {
+    description = "A command-line hex viewer";
+    longDescription = ''
+      `hexyl` is a simple hex viewer for the terminal. It uses a colored
+      output to distinguish different categories of bytes (NULL bytes,
+      printable ASCII characters, ASCII whitespace characters, other ASCII
+      characters and non-ASCII).
+    '';
+    homepage    = https://github.com/sharkdp/hexyl;
+    license     = with licenses; [ asl20 /* or */ mit ];
+    maintainers = [];
+    platforms   = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 37073daa699d..1e747961499c 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
   buildInputs = [ gtk2 hicolor-icon-theme ];
+  NIX_LDFLAGS = [ "-lgio-2.0" ];
 
   preFixup = ''
     # Need which and xdotool on path to fix auto-pasting.
diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix
index c9ab32035de4..393300ddd9e9 100644
--- a/pkgs/tools/misc/pubs/default.nix
+++ b/pkgs/tools/misc/pubs/default.nix
@@ -1,46 +1,21 @@
-{ stdenv, fetchFromGitHub, python3 }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-let
-  python3Packages = (python3.override {
-    packageOverrides = self: super: {
-      # https://github.com/pubs/pubs/issues/131
-      pyfakefs = super.pyfakefs.overridePythonAttrs (oldAttrs: rec {
-        version = "3.3";
-        src = self.fetchPypi {
-          pname = "pyfakefs";
-          inherit version;
-          sha256 = "e3e198dea5e0d5627b73ba113fd0b139bb417da6bc15d920b2c873143d2f12a6";
-        };
-        postPatch = "";
-        doCheck = false;
-      });
-    };
-  }).pkgs;
-
-in python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pubs";
-  version = "0.7.0";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "pubs";
     repo = "pubs";
     rev = "v${version}";
-    sha256 = "0n5wbjx9wqy6smfg625mhma739jyg7c92766biaiffp0a2bzr475";
+    sha256 = "16zwdqfbmlla6906g3a57a4nj8wnl11fq78r20qms717bzv211j0";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    dateutil configobj bibtexparser pyyaml requests beautifulsoup4
+    argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4
   ];
 
-  checkInputs = with python3Packages; [ pyfakefs ddt ];
-
-  preCheck = ''
-    # API tests require networking
-    rm tests/test_apis.py
-
-    # pyfakefs works weirdly in the sandbox
-    export HOME=/
-  '';
+  checkInputs = with python3Packages; [ pyfakefs mock ddt ];
 
   meta = with stdenv.lib; {
     description = "Command-line bibliography manager";
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 6a5e674b698b..4d91c184b0ae 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libX11 libXtst qt4 ];
+  NIX_LDFLAGS = [ "-lX11" ];
   patchPhase = ''
     cd src
     substituteInPlace config --replace /bin/bash /bin/sh
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
new file mode 100644
index 000000000000..cba897431511
--- /dev/null
+++ b/pkgs/tools/misc/void/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "void-${version}";
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "spacejam";
+    repo = "void";
+    rev = "${version}";
+    sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz";
+  };
+
+  # The tests are long-running and not that useful
+  doCheck = false;
+
+  cargoSha256 = "1rq947s82icl7gdkjynjwz426bpmd96dip2dv2y7p8rg7yz29x0m";
+
+  meta = with stdenv.lib; {
+    description = "Terminal-based personal organizer";
+    homepage = https://github.com/spacejam/void;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ spacekookie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix
index b26e915e6909..a4a3cc86f97b 100644
--- a/pkgs/tools/networking/dd-agent/6.nix
+++ b/pkgs/tools/networking/dd-agent/6.nix
@@ -6,14 +6,14 @@ let
 
 in buildGoPackage rec {
   name = "datadog-agent-${version}";
-  version = "6.4.2";
+  version = "6.8.3";
   owner   = "DataDog";
   repo    = "datadog-agent";
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev    = "155fddb3547919bd54530dfdb250e0cb2defae7d";
-    sha256 = "0l7ic0p2h27x386k1gzzm20af2s06cpalmqz0h0c5zq4wszmw5zy";
+    rev    = "${version}";
+    sha256 = "18kk3f10pbcxplshxzbblga6bqlkk5mgy536yy27j463l4xps92q";
   };
 
   subPackages = [
@@ -57,7 +57,7 @@ in buildGoPackage rec {
   # into standard paths.
   postInstall = ''
     mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent
-    cp -R $src/cmd/agent/dist/{conf.d,trace-agent.conf} $bin/share/datadog-agent
+    cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent
     cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages}
 
     cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent
diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
index 41acb533a3de..50a3c98af0f7 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ glib pcap ];
-  NIX_CFLAGS_LINK = "-lglib-2.0";
+  NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread";
   postPatch = ''
     for patch in debian/patches/*.patch; do
       patch < $patch
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 8b8991db86c2..7234d73e1144 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-client-${version}";
 
-  version = "2018-12-05T22-59-07Z";
+  version = "2018-12-27T00-37-49Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "01vjgs96sb792rggc7da9fzbpam5pyr7x9zd4r8wv6jc6xnv7n3x";
+    sha256 = "1hbw3yam5lc9414f3f8yh32ycj0wz2xc934ksvjnrhkk4xzyal6h";
   };
 
   goPackagePath = "github.com/minio/mc";
diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index 4c906812f64d..22f60bfcee55 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional tlsSupport openssl;
 
+  NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index a4c707442345..fefff8573816 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.2";
+  version = "0.9.0";
   baseName = "wavemon";
   name = "${baseName}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "uoaerg";
     repo = "wavemon";
     rev = "v${version}";
-    sha256 = "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs";
+    sha256 = "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index cb99e5af055b..0f45084f3c05 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = https://gitlab.com/tim241/bunny;
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ countingsort ];
+    maintainers = with maintainers; [ buffet ];
   };
 }
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 461e8ff1ec5d..b4383fde3409 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "17g497q6ylq73rql9k2ji2l2b2bj3dd4am30z8i6khnhc0x8s2il";
   };
 
-  # trying to build docs fails with a2x errors, unable to fix through asciidoc
-  configureFlags = [ "--disable-doc" ];
+  configureFlags = [
+    # trying to build docs fails with a2x errors, unable to fix through asciidoc