Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'

18 files changed, 66 insertions, 161 deletions

diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix
index a8db20cede79..a6f1629a4b28 100644
--- a/nixpkgs/pkgs/servers/caddy/default.nix
+++ b/nixpkgs/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.11.1";
+  version = "0.11.4";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l";
+    sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a";
   };
 
   buildFlagsArray = ''
diff --git a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
index 76d925418550..21a5bad72fc8 100644
--- a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
+++ b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
@@ -51,6 +51,6 @@ buildGoPackage rec {
     maintainers = with maintainers; [ hodapp ];
     # TODO: Fix broken build on macOS.  The GitHub presently lists the
     # FreeBSD build as broken too, but this may change in the future.
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch b/nixpkgs/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch
deleted file mode 100644
index 219187644360..000000000000
--- a/nixpkgs/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py
-index 26f42c1..529d2e0 100644
---- a/esphomeyaml/__main__.py
-+++ b/esphomeyaml/__main__.py
-@@ -167,13 +167,10 @@ def compile_program(args, config):
- 
- 
- def upload_using_esptool(config, port):
--    import esptool
--
-     path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin')
--    cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
-+    cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
-            '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path]
--    # pylint: disable=protected-access
--    return run_external_command(esptool._main, *cmd)
-+    return run_external_command(*cmd)
- 
- 
- def upload_program(config, args, host):
-diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py
-index df29491..f991701 100644
---- a/esphomeyaml/platformio_api.py
-+++ b/esphomeyaml/platformio_api.py
-@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__)
- 
- 
- def run_platformio_cli(*args, **kwargs):
--    import platformio.__main__
--
-     os.environ["PLATFORMIO_FORCE_COLOR"] = "true"
--    cmd = ['platformio'] + list(args)
--    return run_external_command(platformio.__main__.main,
--                                *cmd, **kwargs)
-+    cmd = ['@platformio@/bin/platformio'] + list(args)
-+    return run_external_command(*cmd, **kwargs)
- 
- 
- def run_platformio_cli_run(config, verbose, *args, **kwargs):
-diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py
-index eebb4b7..9e9e58f 100644
---- a/esphomeyaml/util.py
-+++ b/esphomeyaml/util.py
-@@ -4,6 +4,7 @@ import io
- import logging
- import re
- import sys
-+import subprocess
- 
- _LOGGER = logging.getLogger(__name__)
- 
-@@ -79,42 +80,25 @@ class RedirectText(object):
-         return True
- 
- 
--def run_external_command(func, *cmd, **kwargs):
--    def mock_exit(return_code):
--        raise SystemExit(return_code)
--
--    orig_argv = sys.argv
--    orig_exit = sys.exit  # mock sys.exit
-+def run_external_command(*cmd, **kwargs):
-     full_cmd = u' '.join(shlex_quote(x) for x in cmd)
-     _LOGGER.info(u"Running:  %s", full_cmd)
- 
--    orig_stdout = sys.stdout
--    sys.stdout = RedirectText(sys.stdout)
--    orig_stderr = sys.stderr
--    sys.stderr = RedirectText(sys.stderr)
--
-     capture_stdout = kwargs.get('capture_stdout', False)
-     if capture_stdout:
--        cap_stdout = sys.stdout = io.BytesIO()
-+        cap_stdout = io.BytesIO()
-+    else:
-+        cap_stdout = sys.stdout
- 
-     try:
--        sys.argv = list(cmd)
--        sys.exit = mock_exit
--        return func() or 0
--    except KeyboardInterrupt:
--        return 1
--    except SystemExit as err:
--        return err.args[0]
-+        completed_process = subprocess.run(cmd,
-+                                           stdout=RedirectText(cap_stdout),
-+                                           stderr=RedirectText(sys.stderr))
-+        return completed_process.returncode
-     except Exception as err:  # pylint: disable=broad-except
-         _LOGGER.error(u"Running command failed: %s", err)
-         _LOGGER.error(u"Please try running %s locally.", full_cmd)
-     finally:
--        sys.argv = orig_argv
--        sys.exit = orig_exit
--
--        sys.stdout = orig_stdout
--        sys.stderr = orig_stderr
--
-         if capture_stdout:
-             # pylint: disable=lost-exception
-             return cap_stdout.getvalue()
-diff --git a/setup.py b/setup.py
-index 78a5378..8ce80de 100755
---- a/setup.py
-+++ b/setup.py
-@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__)
- 
- REQUIRES = [
-     'voluptuous>=0.11.1',
--    'platformio>=3.5.3',
-     'pyyaml>=3.12',
-     'paho-mqtt>=1.3.1',
-     'colorlog>=3.1.2',
-     'tornado>=5.0.0',
--    'esptool>=2.3.1',
-     'typing>=3.0.0',
-     'protobuf>=3.4',
-     'tzlocal>=1.4',
diff --git a/nixpkgs/pkgs/servers/home-assistant/esphome.nix b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
index e089c83239b4..2e0b4abc9391 100644
--- a/nixpkgs/pkgs/servers/home-assistant/esphome.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
@@ -1,29 +1,27 @@
-{ lib, python3, fetchpatch, substituteAll, platformio, esptool }:
+{ lib, python3, fetchpatch, platformio, esptool, git }:
 
 python3.pkgs.buildPythonApplication rec {
-  pname = "esphomeyaml";
-  version = "1.10.1";
+  pname = "esphome";
+  version = "1.11.1";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "426cd545b4e9505ce5b4f5c63d2d54cb038f93fe3ba9d4d56b6b6431b222485d";
+    sha256 = "1764q4wyl8qlk2514gikv8178c8fwhhvbw64zkd76nb107hxzrk5";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./dont-import-platformio-esptool.patch;
-      inherit platformio esptool;
-    })
-  ];
-
-  postPatch = ''
-     # typing is part of the standard library since Python 3.5
-     substituteInPlace setup.py --replace "'typing>=3.0.0'," ""
-  '';
+  ESPHOME_USE_SUBPROCESS = "";
 
   propagatedBuildInputs = with python3.pkgs; [
     voluptuous pyyaml paho-mqtt colorlog
-    tornado protobuf tzlocal pyserial
+    tornado protobuf tzlocal pyserial ifaddr
+  ];
+
+  makeWrapperArgs = [
+    # platformio is used in esphomeyaml/platformio_api.py
+    # esptool is used in esphomeyaml/__main__.py
+    # git is used in esphomeyaml/writer.py
+    "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
+    "--set ESPHOME_USE_SUBPROCESS ''"
   ];
 
   checkPhase = ''
@@ -36,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
-    homepage = https://esphomelib.com/esphomeyaml;
+    homepage = https://esphome.io/;
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };
diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
index c3fcd13a41f8..431e66e38fb8 100644
--- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
+++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
@@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec {
     homepage = http://spamassassin.apache.org/;
     description = "Open-Source Spam Filter";
     license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ peti qknight ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index 46d74c06013d..1b97e0049ed5 100644
--- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -30,6 +30,11 @@ in buildPythonApplication rec {
     sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6";
   };
 
+  patches = [
+    # adds an entry point for the service
+    ./homeserver-script.patch
+  ];
+
   propagatedBuildInputs = [
     bcrypt
     bleach
@@ -77,6 +82,6 @@ in buildPythonApplication rec {
     homepage = https://matrix.org;
     description = "Matrix reference homeserver";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ralith roblabla ekleog ];
+    maintainers = with maintainers; [ ralith roblabla ekleog pacien ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch b/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch
new file mode 100644
index 000000000000..95e28196a229
--- /dev/null
+++ b/nixpkgs/pkgs/servers/matrix-synapse/homeserver-script.patch
@@ -0,0 +1,21 @@
+diff --git a/homeserver b/homeserver
+new file mode 120000
+index 0000000..2f1d413
+--- /dev/null
++++ b/homeserver
+@@ -0,0 +1,1 @@
++synapse/app/homeserver.py
+\ No newline at end of file
+diff --git a/setup.py b/setup.py
+index b00c2af..c7f6e0a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -92,6 +92,6 @@ setup(
+     include_package_data=True,
+     zip_safe=False,
+     long_description=long_description,
+-    scripts=["synctl"] + glob.glob("scripts/*"),
++    scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
+     cmdclass={'test': TestCommand},
+ )
+
diff --git a/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
index 905244833602..c8eb07319245 100644
--- a/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
@@ -19,6 +19,6 @@ buildGoPackage rec {
     license = licenses.mit;
     homepage = https://bosun.org;
     maintainers = with maintainers; [ offline ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
index c6c52bcbda58..d3ddfe26d4a5 100644
--- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
@@ -28,6 +28,6 @@ buildGoPackage rec {
     license = licenses.mit;
     homepage = https://www.influxdata.com/time-series-platform/telegraf/;
     maintainers = with maintainers; [ mic92 roblabla ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix
index a25eff5b05c9..c4dbbbddffbf 100644
--- a/nixpkgs/pkgs/servers/nginx-sso/default.nix
+++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nginx-sso-${version}";
-  version = "0.15.1";
+  version = "0.16.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/Luzifer/nginx-sso";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "Luzifer";
     repo = "nginx-sso";
-    sha256 = "0mm6yhm22wf32yl9wvl8fy9m5jjd491khyy4cl73fn381h3n5qi2";
+    sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b";
   };
 
   postInstall = ''
diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix
index 3d421e7a6ecb..4da3ae362c4d 100644
--- a/nixpkgs/pkgs/servers/samba/4.x.nix
+++ b/nixpkgs/pkgs/servers/samba/4.x.nix
@@ -20,11 +20,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.7.10";
+  version = "4.7.12";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0w5y6a7kiw5ap7hd84yglzk7cjax6lxlszd0wz1sxnmqx4a6hn9l";
+    sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
       "--sysconfdir=/etc"
       "--localstatedir=/var"
     ]
-    ++ optional (!enableDomainController) "--without-ad-dc"
+    ++ [(if enableDomainController
+         then "--with-experimental-mit-ad-dc"
+         else "--without-ad-dc")]
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]
     ++ optional (!enableAcl) "--without-acl-support"
     ++ optional (!enablePam) "--without-pam";
diff --git a/nixpkgs/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix
index ffbeb2fca34c..90768e8f66ee 100644
--- a/nixpkgs/pkgs/servers/slimserver/default.nix
+++ b/nixpkgs/pkgs/servers/slimserver/default.nix
@@ -99,6 +99,6 @@ perlPackages.buildPerlPackage rec {
     # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt
     license = licenses.unfree;
     maintainers = [ maintainers.phile314 ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
index c1c70955d1ff..1f5ba6150edc 100644
--- a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "2.1.3";
+  version = "2.1.5";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n";
+    sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn";
   };
 
   inherit nativeBuildInputs buildInputs;
diff --git a/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
index e440f11b2e44..c77330bd2ace 100644
--- a/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
+++ b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "percona-server-${version}";
-  version = "5.6.35-80.0";
+  version = "5.6.43-84.3";
 
   src = fetchurl {
     url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz";
-    sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5";
+    sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw";
   };
 
   buildInputs = [ cmake bison ncurses openssl zlib libaio perl ];
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
     rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a
-    rm $out/share/man/man1/mysql-test-run.pl.1
   '';
 
   passthru.mysqlVersion = "5.6";
@@ -57,6 +56,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ grahamc ];
-    broken = true; # 2018-04-11
   };
 }
diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix
index 0f08d94a052f..9ba60416119c 100644
--- a/nixpkgs/pkgs/servers/teleport/default.nix
+++ b/nixpkgs/pkgs/servers/teleport/default.nix
@@ -36,6 +36,6 @@ buildGoPackage rec {
     homepage = "https://gravitational.com/teleport/";
     license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.tomberek ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/trezord/default.nix b/nixpkgs/pkgs/servers/trezord/default.nix
index 98079c37f1f8..696baff0ca32 100644
--- a/nixpkgs/pkgs/servers/trezord/default.nix
+++ b/nixpkgs/pkgs/servers/trezord/default.nix
@@ -21,6 +21,6 @@ buildGoPackage rec {
     homepage = https://trezor.io;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/servers/tvheadend/default.nix b/nixpkgs/pkgs/servers/tvheadend/default.nix
index 674d96e54622..e05d9e919d17 100644
--- a/nixpkgs/pkgs/servers/tvheadend/default.nix
+++ b/nixpkgs/pkgs/servers/tvheadend/default.nix
@@ -3,7 +3,7 @@
 , which, zlib }:
 
 let
-  version = "4.2.7";
+  version = "4.2.8";
 
 in stdenv.mkDerivation rec {
   name = "tvheadend-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner  = "tvheadend";
     repo   = "tvheadend";
     rev    = "v${version}";
-    sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g";
+    sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/servers/uftp/default.nix b/nixpkgs/pkgs/servers/uftp/default.nix
index 768fdf0b46f8..297a0215aac7 100644
--- a/nixpkgs/pkgs/servers/uftp/default.nix
+++ b/nixpkgs/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.8";
+  version = "4.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379";
+    sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0";
   };
 
   buildInputs = [ openssl ];