Merge branch 'master' into staging

* master: (63 commits)
  tests.cc-wrapper: do not test sanitizers on darwin
  nodePackages_8_x: Add nodejs (npm) to wrapper
  python.pkgs.cairocffi: support darwin
  osinfo-db: 20180514 -> 20180531 (#41532)
  pkcs11helper: 1.22 -> 1.23 (#41530)
  pmd: 6.3.0 -> 6.4.0 (#41529)
  renpy: 6.99.14.3 -> 7.0.0 (#41515)
  wireless-regdb: 2018.05.09 -> 2018.05.31 (#41502)
  gnuplot: 5.2.3 -> 5.2.4 (#41505)
  qrencode: 4.0.0 -> 4.0.1
  Revert "libbsd: replace with nbcompat"
  Revert "opendkim: fix libbsd dependency"
  Revert "libbsd-freedesktop: re-init at 0.9.1, use for samba"
  flent: fix fetchFromGitHub version
  syncthing: 0.14.47 -> 0.14.48
  pythonPackages.pykdtree: init at 1.3.0 (#41355)
  snd: 18.3 -> 18.4
  bat: support darwin
  faust2: fix build with llvm 5.0.2 (#40672)
  mc: 4.8.20 -> 4.8.21 (#41496)
  ...

pkgs/development/python-modules/cairocffi/default.nix

@@ -1,5 +1,6 @@
 # FIXME: make gdk_pixbuf dependency optional
-{ buildPythonPackage
+{ stdenv
+, buildPythonPackage
 , fetchPypi
 , lib
 , substituteAll
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
     (substituteAll {
       src = ./dlopen-paths.patch;
+      ext = stdenv.hostPlatform.extensions.sharedLibrary;
       cairo = cairo.out;
       glib = glib.out;
       gdk_pixbuf = gdk_pixbuf.out;

pkgs/development/python-modules/cairocffi/dlopen-paths.patch

@@ -16,10 +16,10 @@ index 718aa7f..1a1dcff 100644
  
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
-+    'cairo': '@cairo@/lib/libcairo.so.2',
-+    'glib-2.0': '@glib@/lib/libglib-2.0.so.0',
-+    'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0',
++    'cairo': '@cairo@/lib/libcairo@ext@',
++    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
++    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
  
 -def dlopen(ffi, *names):

pkgs/development/python-modules/pykdtree/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
+
+buildPythonPackage rec {
+  pname = "pykdtree";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776";
+  };
+
+  buildInputs = [ openmp ];
+
+  propagatedBuildInputs = [ numpy ];
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "kd-tree implementation for fast nearest neighbour search in Python";
+    homepage = https://github.com/storpipfugl/pykdtree;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}

pkgs/development/python-modules/typing-extensions/default.nix

@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python, typing }:
+let
+  testDir = if isPy3k then "src_py3" else "src_py2";
+
+in buildPythonPackage rec {
+  pname = "typing_extensions";
+  version = "3.6.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09xxykw8mk30r0g33r2gy5qlqw3sqj5vkp6h7nh0flp59hxqw2hw";
+  };
+
+  checkInputs = lib.optional (pythonOlder "3.5") typing;
+
+  # Error for Python3.6: ImportError: cannot import name 'ann_module'
+  # See https://github.com/python/typing/pull/280
+  doCheck = pythonOlder "3.6";
+
+  checkPhase = ''
+    cd ${testDir}
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with lib; {
+    description = "Backported and Experimental Type Hints for Python 3.5+";
+    homepage = https://github.com/python/typing;
+    license = licenses.psfl;
+    maintainers = with maintainers; [ pmiddend ];
+  };
+}

pkgs/development/python-modules/voluptuous-serialize/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }:
+
+buildPythonPackage rec  {
+  pname = "voluptuous-serialize";
+  version = "2018-03-10";
+
+  disabled = !isPy3k;
+
+  # no tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "balloob";
+    repo = pname;
+    rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82";
+    sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50";
+  };
+
+  propagatedBuildInputs = [
+    voluptuous
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/balloob/voluptuous-serialize;
+    license = licenses.asl20;
+    description = "Convert Voluptuous schemas to dictionaries so they can be serialized";
+    maintainers = with maintainers; [ etu ];
+  };
+}