Merge branch 'master' into staging

* master: (25 commits)
  prosody: 0.10.1 -> 0.10.2
  mpd: fix spelling in description
  pulseaudio-ctl: init at 1.66
  qt: remove install_name_tool stuff
  multimc: 0.6.1 -> 0.6.2
  lib: test for bitAnd, bitOr, bitXor
  pandas: fix check with the current pytest
  qt: fixup from c4cac55d69
  calibre: 2.24.1 -> 2.25.0
  spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356)
  libbsd-freedesktop: re-init at 0.9.1, use for samba
  sbt: 1.1.4 -> 1.1.6
  nixos/slurm: remove propagatedBuidInputs from slurmWrapped
  gitkraken: 3.6.1 -> 3.6.3
  pass-import: export PREFIX, set PASSWORD_STORE_BIN
  pass: Add pass-audit extension
  slurm: add maintainer
  nixos/slurm: update test, add test for enableStools
  slurm: add freeipmi, readline, libssh2, fix hwloc
  nixos/slurm: Add man pages to wrapedSlurm
  ...

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

@@ -55,6 +55,8 @@ in buildPythonPackage rec {
     xlwt
   ];
 
+  patches = [ ./pandas-0.22.0-pytest-3.5.1.patch ];
+
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
   postPatch = optionalString isDarwin ''

pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch

@@ -0,0 +1,13 @@
+--- a/pandas/tests/io/test_pytables.py
++++ b/pandas/tests/io/test_pytables.py
+@@ -5028,8 +5028,8 @@ class TestHDFStore(Base):
+             with ensure_clean_path(self.path) as path:
+                 with catch_warnings(record=True):
+                     with pytest.raises(
+-                        ValueError, msg=("cannot have non-object label "
+-                                         "DataIndexableCol")):
++                        ValueError, message=("cannot have non-object label "
++                                             "DataIndexableCol")):
+                         df.to_hdf(path, 'df', format='table',
+                                   data_columns=True)
+