Merge master into staging-next

2018-09-01 10:41:58 +02:00 · 2018-09-01 10:41:58 +02:00 · 4134048b6f
commit 4134048b6f
parent 43f6ceabb8 4a74aca868
34 changed files with 46485 additions and 49210 deletions
--- a/doc/languages-frameworks/node.section.md
+++ b/doc/languages-frameworks/node.section.md
@ -14,7 +14,7 @@ project.

 The package set also provides support for multiple Node.js versions. The policy
 is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 6.x), unless there is an explicit reason to support
+release (which is currently 8.x), unless there is an explicit reason to support
 a different release.

 If your package uses native addons, you need to examine what kind of native
@ -26,7 +26,7 @@ build system it uses. Here are some examples:

 After you have identified the correct system, you need to override your package
 expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
+requires `node-gyp-build`, so we override its expression in `default-v8.nix`:

 ```nix
 dat = nodePackages.dat.override (oldAttrs: {
@ -36,14 +36,14 @@ dat = nodePackages.dat.override (oldAttrs: {

 To add a package from NPM to nixpkgs:

- 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
-    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
-    for packages depending on Node.js 4.x)
+ 1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
+    for packages depending on Node.js 10.x)
 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
 3. Build your new package to test your changes:
    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific Node.js version (e.g. 4.x):
-    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
+    To build against a specific Node.js version (e.g. 10.x):
+    `nix-build -A nodePackages_10_x.<new-or-updated-package>`
 4. Add and commit all modified and generated files.

 For more information about the generation process, consult the
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@ -1732,7 +1732,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
       Controls whether the installCheck phase is executed. By default it is
       skipped, but if <varname>doInstallCheck</varname> is set to true, the
       installCheck phase is usually executed. Thus you should set
-<programlisting>doInstallCheck = true;</programlisting>
+       <programlisting>doInstallCheck = true;</programlisting>
       in the derivation to enable install checks. The exception is cross
       compilation. Cross compiled builds never run tests, no matter how
       <varname>doInstallCheck</varname> is set, as the newly-built program
@ -1740,6 +1740,29 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </para>
     </listitem>
    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>installCheckTarget</varname>
+     </term>
+     <listitem>
+      <para>
+       The make target that runs the install tests. Defaults to
+       <literal>installcheck</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>installCheckFlags</varname> / <varname>installCheckFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
+       but only used by the installCheck phase.
+      </para>
+     </listitem>
+    </varlistentry>
    <varlistentry>
     <term>
      <varname>installCheckInputs</varname>
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@ -50,4 +50,14 @@ $ nix-store --optimise
  Since this command needs to read the entire Nix store, it can take quite a
  while to finish.
 </para>
+ <section xml:id="sect-nixos-gc-boot-entries">
+  <title>NixOS Boot Entries</title>
+
+  <para>
+   If your <filename>/boot</filename> partition runs out of space, after
+   clearing old profiles you must rebuild your system with
+   <literal>nixos-rebuild</literal> to update the <filename>/boot</filename>
+   partition and clear space.
+  </para>
+ </section>
 </chapter>
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@ -0,0 +1,44 @@
+{ stdenv
+, fetchurl
+, cmake
+, qtbase
+, qtsvg
+, qtmultimedia
+, qttools
+, kdnssd
+, karchive
+, libsodium
+, libmicrohttpd
+, giflib
+, miniupnpc
+}:
+
+stdenv.mkDerivation rec {
+  name = "drawpile-${version}";
+  version = "2.0.11";
+  src = fetchurl {
+    url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
+    sha256 = "0h018rxhc0lwpqwmlihalz634nd0xaafk4p2b782djjd87irnjpk";
+  };
+  buildInputs = [
+    cmake
+    qtbase qtsvg qtmultimedia qttools
+    karchive
+    # optional deps:
+    libsodium # ext-auth support
+    libmicrohttpd # HTTP admin api
+    giflib # gif animation export support
+    miniupnpc # automatic port forwarding
+    kdnssd # local server discovery with Zeroconf
+  ];
+  configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out .";
+
+  meta = with stdenv.lib; {
+    description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
+    homepage = https://drawpile.net/;
+    downloadPage = https://drawpile.net/download/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:

 stdenv.mkDerivation rec {
-  version = "1.0.13";
+  version = "1.0.14";
  name = "mdp-${version}";

  src = fetchFromGitHub {
    owner = "visit1985";
    repo = "mdp";
    rev = version;
-    sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq";
+    sha256 = "1nljb2bkk7kswywvvn3b2k6q14bh2jnwm8cypax3mwssjmid78af";
  };

  makeFlags = [ "PREFIX=$(out)" ];
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";

 stdenv.mkDerivation rec {
  name = "shotcut-${version}";
-  version = "18.08";
+  version = "18.08.14";

  src = fetchFromGitHub {
    owner = "mltframework";
    repo = "shotcut";
    rev = "v${version}";
-    sha256 = "1p2s4avm3bl5ippmgfzkkbb2w0xs4vhk2wbcd22g7bh1zq9w190n";
+    sha256 = "074df9vc0rdb4byalaarq522vkfq5mrhxs4dgbyqls3ryd3hj1ds";
  };

  enableParallelBuilding = true;
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@ -3,37 +3,32 @@
 stdenv.mkDerivation rec {
  name = "${pname}-${version}";
  pname = "deepin-icon-theme";
-  version = "15.12.52";
+  version = "15.12.59";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l";
-    
-    # Get rid of case collision in file names, which is an issue in
-    # darwin where file names are case insensitive.
-    extraPostFetch = ''
-      rm "$out"/Sea/apps/scalable/TeXmacs.svg
-      rm "$out"/deepin/apps/48/TeXmacs.svg
-    ''; 
+    sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq";
  };

  nativeBuildInputs = [ gtk3 papirus-icon-theme ];

-  makeFlags = [ "PREFIX=$(out)" ];
+  postPatch = ''
+    patchShebangs .

-  postFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
+    # install in $out
+    sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links
+
+    # keep icon-theme.cache
+    sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
  '';

  meta = with stdenv.lib; {
-    description = "Deepin icon theme";
+    description = "Icons for the Deepin Desktop Environment";
    homepage = https://github.com/linuxdeepin/deepin-icon-theme;
    license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ romildo ];
  };
 }
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "deepin-terminal-${version}";
-  version = "3.0.0";
+  version = "3.0.3";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "deepin-terminal";
    rev = version;
-    sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r";
+    sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa";
  };

  patches = [
@ -29,15 +29,17 @@ stdenv.mkDerivation rec {
    # For setup hook
    gobjectIntrospection
  ];
+
  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];

  meta = with stdenv.lib; {
    description = "The default terminal emulation for Deepin";
    longDescription = ''
      Deepin terminal, it sharpens your focus in the world of command line!
-      It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
+      It is an advanced terminal emulator with workspace, multiple
+      windows, remote management, quake mode and other features.
     '';
-    homepage = https://github.com/linuxdeepin/deepin-terminal/;
+    homepage = https://github.com/linuxdeepin/deepin-terminal;
    license = licenses.gpl3;
    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@ -17,8 +17,8 @@ let
      "i386"
    else "amd64";

-  update = "10.0.1";
-  build = "10";
+  update = "10.0.2";
+  build = "13";
  repover = "jdk-${update}+${build}";
  paxflags = if stdenv.isi686 then "msp" else "m";

@ -27,7 +27,7 @@ let

    src = fetchurl {
      url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
-      sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw";
+      sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
    };

    outputs = [ "out" "jre" ];
--- a/pkgs/development/compilers/openjdk/darwin/10.nix
+++ b/pkgs/development/compilers/openjdk/darwin/10.nix
@ -7,11 +7,11 @@ let
  };

  jdk = stdenv.mkDerivation {
-    name = "zulu10.1+11-jdk10";
+    name = "zulu10.3+5-jdk10";

    src = fetchurl {
-      url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip";
-      sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
+      url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
+      sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
    };

--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {

  postPatch = ''
    sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
-  '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) ''
+  '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
    ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
    ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, autoreconfHook, libkrb5 }:

 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.3";
+  name = "libtirpc-1.1.4";

  src = fetchurl {
    url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6";
+    sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
  };

  postPatch = ''
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@ -7,78 +7,17 @@ let
  };
 in
 nodePackages // {
-  dat = nodePackages.dat.override {
-    buildInputs = [ nodePackages.node-gyp-build ];
-  };
-
-  dnschain = nodePackages.dnschain.override {
-    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
-    postInstall = ''
-      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
-    '';
-  };
-
-  node-inspector = nodePackages.node-inspector.override {
-    buildInputs = [ nodePackages.node-pre-gyp ];
-  };
-
-  phantomjs = nodePackages.phantomjs.override {
-    buildInputs = [ pkgs.phantomjs2 ];
-  };
-
-  webdrvr = nodePackages.webdrvr.override {
-    buildInputs = [ pkgs.phantomjs ];
-
-    preRebuild = ''
-      mkdir $TMPDIR/webdrvr
-
-      ln -s ${pkgs.fetchurl {
-        url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
-        sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
-      }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
-      ln -s ${pkgs.fetchurl {
-        url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
-        sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
-      }} $TMPDIR/webdrvr/chromedriver_linux64.zip
-    '';
-
-    dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  };
-
-  npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
-    postInstall = "npm run-script prepublish";
-  };
-
-  bower2nix = nodePackages.bower2nix.override {
-    buildInputs = [ pkgs.makeWrapper ];
-    postInstall = ''
-      for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
      done
    '';
  };
-
-  ios-deploy = nodePackages.ios-deploy.override {
-    preRebuild = ''
-      LD=$CC
-      tmp=$(mktemp -d)
-      ln -s /usr/bin/xcodebuild $tmp
-      export PATH="$PATH:$tmp"
-    '';
-  };
-
-  fast-cli = nodePackages."fast-cli-1.x".override {
-    preRebuild = ''
-      # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
-      sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
-    '';
-    buildInputs = [ pkgs.phantomjs2 ];
-  };
-
-  node2nix =  nodePackages.node2nix.override {
-    buildInputs = [ pkgs.makeWrapper ];
-    postInstall = ''
-      wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
-    '';
-  };
 }
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@ -7,25 +7,76 @@ let
  };
 in
 nodePackages // {
+  bower2nix = nodePackages.bower2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
+      done
+    '';
+  };
+
  dat = nodePackages.dat.override {
    buildInputs = [ nodePackages.node-gyp-build ];
  };

-  dnschain =  nodePackages.dnschain.override {
+  dnschain = nodePackages.dnschain.override {
    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
    postInstall = ''
      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
    '';
  };

+  ios-deploy = nodePackages.ios-deploy.override {
+    preRebuild = ''
+      LD=$CC
+      tmp=$(mktemp -d)
+      ln -s /usr/bin/xcodebuild $tmp
+      export PATH="$PATH:$tmp"
+    '';
+  };
+
+  fast-cli = nodePackages."fast-cli-1.x".override {
+    preRebuild = ''
+      # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
+      sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
+    '';
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
+
  node-inspector = nodePackages.node-inspector.override {
    buildInputs = [ nodePackages.node-pre-gyp ];
  };

+  node2nix =  nodePackages.node2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
+    postInstall = ''
+      wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
+    '';
+  };
+
+  npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
+    postInstall = "npm run-script prepublish";
+  };
+
  phantomjs = nodePackages.phantomjs.override {
    buildInputs = [ pkgs.phantomjs2 ];
  };

+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
+      done
+    '';
+  };
+
  webdrvr = nodePackages.webdrvr.override {
    buildInputs = [ pkgs.phantomjs ];

@ -45,47 +96,4 @@ nodePackages // {
    dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
  };

-  npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
-    postInstall = "npm run-script prepublish";
-  };
-
-  bower2nix = nodePackages.bower2nix.override {
-    buildInputs = [ pkgs.makeWrapper ];
-    postInstall = ''
-      for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
-      done
-    '';
-  };
-
-  ios-deploy = nodePackages.ios-deploy.override {
-    preRebuild = ''
-      LD=$CC
-      tmp=$(mktemp -d)
-      ln -s /usr/bin/xcodebuild $tmp
-      export PATH="$PATH:$tmp"
-    '';
-  };
-
-  pnpm = nodePackages.pnpm.override {
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    postInstall = let
-      pnpmLibPath = stdenv.lib.makeBinPath [
-        nodejs.passthru.python
-        nodejs
-      ];
-    in ''
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
-      done
-    '';
-  };
-
-  fast-cli = nodePackages."fast-cli-1.x".override {
-    preRebuild = ''
-      # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
-      sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
-    '';
-    buildInputs = [ pkgs.phantomjs2 ];
-  };
 }
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@ -661,13 +661,13 @@ let
        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
      };
    };
-    "glob-7.1.2" = {
+    "glob-7.1.3" = {
      name = "glob";
      packageName = "glob";
-      version = "7.1.2";
+      version = "7.1.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
+        sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
      };
    };
    "global-modules-1.0.0" = {
@ -787,13 +787,13 @@ let
        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
      };
    };
-    "iconv-lite-0.4.23" = {
+    "iconv-lite-0.4.24" = {
      name = "iconv-lite";
      packageName = "iconv-lite";
-      version = "0.4.23";
+      version = "0.4.24";
      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
-        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
      };
    };
    "ignore-walk-3.0.1" = {
@ -1183,22 +1183,22 @@ let
        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
      };
    };
-    "mime-db-1.35.0" = {
+    "mime-db-1.36.0" = {
      name = "mime-db";
      packageName = "mime-db";
-      version = "1.35.0";
+      version = "1.36.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
-        sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz";
+        sha512 = "L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==";
      };
    };
-    "mime-types-2.1.19" = {
+    "mime-types-2.1.20" = {
      name = "mime-types";
      packageName = "mime-types";
-      version = "2.1.19";
+      version = "2.1.20";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
-        sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz";
+        sha512 = "HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==";
      };
    };
    "minimatch-3.0.4" = {
@ -2416,7 +2416,7 @@ in
      sources."fstream-1.0.11"
      sources."gauge-2.7.4"
      sources."getpass-0.1.7"
-      sources."glob-7.1.2"
+      sources."glob-7.1.3"
      sources."graceful-fs-4.1.11"
      sources."har-schema-2.0.0"
      sources."har-validator-5.1.0"
@ -2434,8 +2434,8 @@ in
      sources."json-schema-traverse-0.3.1"
      sources."json-stringify-safe-5.0.1"
      sources."jsprim-1.4.1"
-      sources."mime-db-1.35.0"
-      sources."mime-types-2.1.19"
+      sources."mime-db-1.36.0"
+      sources."mime-types-2.1.20"
      sources."minimatch-3.0.4"
      sources."minimist-0.0.8"
      sources."mkdirp-0.5.1"
@ -2530,9 +2530,9 @@ in
      sources."fs-minipass-1.2.5"
      sources."fs.realpath-1.0.0"
      sources."gauge-2.7.4"
-      sources."glob-7.1.2"
+      sources."glob-7.1.3"
      sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.23"
+      sources."iconv-lite-0.4.24"
      sources."ignore-walk-3.0.1"
      sources."inflight-1.0.6"
      sources."inherits-2.0.3"
@ -2593,10 +2593,10 @@ in
  pnpm = nodeEnv.buildNodePackage {
    name = "pnpm";
    packageName = "pnpm";
-    version = "2.13.5";
+    version = "2.13.6";
    src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.5.tgz";
-      sha512 = "JImNFSl+9EpBYJ4B3mvlAqkh1r8qweq1RsEsQ0BAUgL3+ZsMFtWYjRRlElg0u5FXwU+11p8s1bePIRTCQTKZ4g==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
+      sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
    };
    buildInputs = globalBuildInputs;
    meta = {
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@ -1,124 +1,9 @@
 [
-  "alloy"
-, "asar"
-, "azure-cli"
-, "bower"
-, "bower2nix"
-, "browserify"
-, "castnow"
-, "clean-css"
+  "bower"
 , "coffee-script"
-, "coinmon"
-, "configurable-http-proxy"
-, "cordova"
-, "create-react-app"
-, "create-react-native-app"
-, "csslint"
-, "dat"
-, "dhcp"
-, "dnschain"
-, "docker-registry-server"
-, "elasticdump"
-, "elm-oracle"
-, "elm-test"
-, "emoj"
-, "eslint"
-, "eslint_d"
-, "emojione"
-, { "fast-cli": "1.x" }
-, "fetch-bower"
-, "forever"
-, "git-run"
-, "git-standup"
-, "graphql-cli"
 , "grunt-cli"
-, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
-, "gulp"
-, "hipache"
-, "htmlhint"
-, "html-minifier"
-, "ionic"
-, "ios-deploy"
-, "istanbul"
-, "imapnotify"
-, "jake"
-, "javascript-typescript-langserver"
-, "jayschema"
-, "jsdoc"
-, "jshint"
-, "json"
-, "js-beautify"
-, "jsonlint"
-, "jsontool"
-, "json-diff"
-, "json-refs"
-, "json-server"
-, "js-yaml"
-, "karma"
-, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
-, "lcov-result-merger"
-, "leetcode-cli"
-, "lerna"
-, "less"
-, "less-plugin-clean-css"
-, "live-server"
-, "livedown"
-, "madoko"
-, "meat"
-, "meguca"
-, "mocha"
-, "multi-file-swagger"
-, "nijs"
-, "node2nix"
 , "node-gyp"
 , "node-gyp-build"
-, "node-inspector"
 , "node-pre-gyp"
-, "nodemon"
-, "node-red"
-, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
-, "npm"
-, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
-, "npm-check-updates"
-, "nsp"
-, "ocaml-language-server"
-, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
-, "peerflix"
-, "peerflix-server"
-, "phantomjs"
-, "prettier"
-, "pulp"
-, "quassel-webserver"
-, "react-tools"
-, "react-native-cli"
-, "s3http"
-, "semver"
-, "serve"
-, "shout"
-, "sinopia"
-, "sloc"
-, "smartdc"
-, "socket.io"
-, "stackdriver-statsd-backend"
-, "statsd"
-, "statsd-influxdb-backend"
-, "statsd-librato-backend"
-, "stylus"
-, "svgo"
-, "tern"
-, "tiddlywiki"
-, "titanium"
-, "triton"
-, "typescript"
-, "typings"
-, "uglify-js"
-, "ungit"
-, "vue-cli"
-, "webdrvr"
-, "webpack"
-, "webtorrent-cli"
-, "web-ext"
-, "wring"
-, "yarn"
-, "yo"
+, "pnpm"
 ]
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@ -1,20 +1,130 @@
 [
-  "bower"
+  "alloy"
+, "asar"
+, "azure-cli"
+, "bower"
+, "bower2nix"
+, "browserify"
+, "castnow"
+, "clean-css"
 , "coffee-script"
+, "coinmon"
+, "configurable-http-proxy"
+, "cordova"
 , "create-cycle-app"
+, "create-react-app"
+, "create-react-native-app"
+, "csslint"
 , "dat"
+, "dhcp"
+, "dnschain"
+, "docker-registry-server"
+, "elasticdump"
+, "elm-oracle"
+, "elm-test"
+, "emoj"
+, "eslint"
+, "eslint_d"
+, "emojione"
+, { "fast-cli": "1.x" }
+, "fetch-bower"
+, "forever"
+, "git-run"
+, "git-standup"
+, "graphql-cli"
 , "grunt-cli"
+, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
+, "gulp"
+, "hipache"
+, "htmlhint"
+, "html-minifier"
+, "ionic"
+, "ios-deploy"
+, "istanbul"
+, "imapnotify"
+, "jake"
+, "javascript-typescript-langserver"
+, "jayschema"
+, "jsdoc"
+, "jshint"
+, "json"
+, "js-beautify"
+, "jsonlint"
+, "jsontool"
+, "json-diff"
+, "json-refs"
+, "json-server"
+, "js-yaml"
+, "karma"
+, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
+, "lcov-result-merger"
+, "leetcode-cli"
+, "lerna"
+, "less"
+, "less-plugin-clean-css"
+, "live-server"
+, "livedown"
+, "madoko"
+, "mathjax"
+, "meat"
+, "meguca"
 , "mocha"
+, "multi-file-swagger"
 , "nijs"
+, "node2nix"
 , "node-gyp"
 , "node-gyp-build"
+, "node-inspector"
 , "node-pre-gyp"
-, "pnpm"
-, "semver"
-, "sloc"
-, "vue-cli"
-, "swagger"
+, "nodemon"
+, "node-red"
+, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , "npm"
+, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
+, "npm-check-updates"
+, "nsp"
+, "ocaml-language-server"
+, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
+, "peerflix"
+, "peerflix-server"
+, "phantomjs"
+, "pnpm"
+, "prettier"
+, "pulp"
+, "quassel-webserver"
+, "react-tools"
+, "react-native-cli"
+, "s3http"
+, "semver"
+, "serve"
+, "shout"
+, "sinopia"
+, "sloc"
+, "smartdc"
+, "socket.io"
+, "stackdriver-statsd-backend"
+, "statsd"
+, "statsd-influxdb-backend"
+, "statsd-librato-backend"
+, "stylus"
+, "svgo"
+, "swagger"
+, "tern"
 , "three"
-, "mathjax"
+, "tiddlywiki"
+, "titanium"
+, "triton"
+, "typescript"
+, "typings"
+, "uglify-js"
+, "ungit"
+, "vue-cli"
+, "@vue/cli"
+, "webdrvr"
+, "webpack"
+, "webtorrent-cli"
+, "web-ext"
+, "wring"
+, "yarn"
+, "yo"
 ]
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
--- a/pkgs/development/python-modules/pyotp/default.nix
+++ b/pkgs/development/python-modules/pyotp/default.nix
@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pyotp";
+  version = "2.2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69";
+  };
+
+  meta = with lib; {
+    description = "Python One Time Password Library";
+    homepage = https://github.com/pyotp/pyotp;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/pyqrcode/default.nix
+++ b/pkgs/development/python-modules/pyqrcode/default.nix
@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "PyQRCode";
+  version = "1.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5";
+  };
+
+  # No tests in PyPI tarball
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output";
+    homepage = https://github.com/mnooner256/pyqrcode;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@ -11,7 +11,7 @@ in {
  };

  fuse_3 = mkFuse {
-    version = "3.2.5";
-    sha256Hash = "0ibf2isbkm8p1gfaqpqblwsg0lm4s1rmcipv1qcg0wc4wwsbnqpx";
+    version = "3.2.6";
+    sha256Hash = "0harsla45b0pj3khgxkcwfr2qd8pahg70ygki9i0a8pzscy64sl2";
  };
 }
--- a/pkgs/os-specific/linux/fuse/fuse3-install.patch
+++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch
@ -1,11 +1,15 @@
--- a/util/install_helper.sh	2018-04-01 01:05:19.613723599 +0200
-+++ b/util/install_helper.sh	2018-04-01 01:06:02.952845382 +0200
-@@ -11,22 +11,14 @@
- udevrulesdir="$3"
- prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
+--- a/util/install_helper.sh	2018-08-31 21:22:34.580563286 +0200
+++ b/util/install_helper.sh	2018-08-31 21:30:54.837939149 +0200
+@@ -22,30 +22,11 @@
+     DESTDIR="${DESTDIR%/}"
+ fi
+ 
+-chown root:root "${DESTDIR}${bindir}/fusermount3"
+-chmod u+s "${DESTDIR}${bindir}/fusermount3"
+-
+ install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
+ 	"${DESTDIR}${sysconfdir}/fuse.conf"
 
-chown root:root "${prefix}/${bindir}/fusermount3"
-chmod u+s "${prefix}/${bindir}/fusermount3"
 -
 -if test ! -e "${DESTDIR}/dev/fuse"; then
 -    mkdir -p "${DESTDIR}/dev"
@ -13,16 +17,18 @@
 -fi
 -
 install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
-        "${DESTDIR}/${udevrulesdir}/99-fuse3.rules"
-+        "${prefix}/${udevrulesdir}/99-fuse3.rules"
+-        "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+        "${sysconfdir}/udev/rules.d/99-fuse3.rules"
 
 install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
-        "${DESTDIR}/etc/init.d/fuse3"
-+        "${prefix}/etc/init.d/fuse3"
- 
- install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
-	"${DESTDIR}/etc/fuse.conf"
-+	"${prefix}/etc/fuse.conf"
-
- if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
-     /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
+         "${DESTDIR}${sysconfdir}/init.d/fuse3"
+-
+-
+-if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
+-    /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
+-else
+-    echo "== FURTHER ACTION REQUIRED =="
+-    echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
+-fi
+-
+-
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "0.76.1";
+  version = "0.77.1";
  components = {
    "abode" = ps: with ps; [  ];
    "ads" = ps: with ps; [  ];
@ -48,6 +48,7 @@
    "auth" = ps: with ps; [ aiohttp-cors ];
    "auth.indieauth" = ps: with ps; [  ];
    "auth.login_flow" = ps: with ps; [  ];
+    "auth.mfa_setup_flow" = ps: with ps; [  ];
    "automation" = ps: with ps; [  ];
    "automation.event" = ps: with ps; [  ];
    "automation.homeassistant" = ps: with ps; [  ];
@ -96,7 +97,7 @@
    "binary_sensor.homematicip_cloud" = ps: with ps; [  ];
    "binary_sensor.hydrawise" = ps: with ps; [  ];
    "binary_sensor.ihc" = ps: with ps; [  ];
-    "binary_sensor.insteon_plm" = ps: with ps; [  ];
+    "binary_sensor.insteon" = ps: with ps; [  ];
    "binary_sensor.iss" = ps: with ps; [  ];
    "binary_sensor.isy994" = ps: with ps; [  ];
    "binary_sensor.knx" = ps: with ps; [  ];
@ -185,7 +186,7 @@
    "camera.netatmo" = ps: with ps; [  ];
    "camera.onvif" = ps: with ps; [ ha-ffmpeg ];
    "camera.proxy" = ps: with ps; [ pillow ];
-    "camera.push" = ps: with ps; [  ];
+    "camera.push" = ps: with ps; [ aiohttp-cors ];
    "camera.ring" = ps: with ps; [ ha-ffmpeg ];
    "camera.rpi_camera" = ps: with ps; [  ];
    "camera.skybell" = ps: with ps; [  ];
@ -249,7 +250,6 @@
    "comfoconnect" = ps: with ps; [  ];
    "config" = ps: with ps; [ aiohttp-cors ];
    "config.auth" = ps: with ps; [  ];
-    "config.auth_provider_homeassistant" = ps: with ps; [  ];
    "config.automation" = ps: with ps; [  ];
    "config.config_entries" = ps: with ps; [ voluptuous-serialize ];
    "config.core" = ps: with ps; [  ];
@ -261,6 +261,7 @@
    "config.zwave" = ps: with ps; [  ];
    "configurator" = ps: with ps; [  ];
    "conversation" = ps: with ps; [ aiohttp-cors ];
+    "conversation.util" = ps: with ps; [  ];
    "counter" = ps: with ps; [  ];
    "cover" = ps: with ps; [  ];
    "cover.abode" = ps: with ps; [  ];
@ -366,6 +367,7 @@
    "dweet" = ps: with ps; [  ];
    "dyson" = ps: with ps; [  ];
    "ecobee" = ps: with ps; [  ];
+    "ecovacs" = ps: with ps; [  ];
    "egardia" = ps: with ps; [  ];
    "eight_sleep" = ps: with ps; [  ];
    "emoncms_history" = ps: with ps; [  ];
@ -379,8 +381,7 @@
    "fan.comfoconnect" = ps: with ps; [  ];
    "fan.demo" = ps: with ps; [  ];
    "fan.dyson" = ps: with ps; [  ];
-    "fan.insteon_local" = ps: with ps; [  ];
-    "fan.insteon_plm" = ps: with ps; [  ];
+    "fan.insteon" = ps: with ps; [  ];
    "fan.isy994" = ps: with ps; [  ];
    "fan.mqtt" = ps: with ps; [ paho-mqtt ];
    "fan.template" = ps: with ps; [  ];
@ -409,6 +410,10 @@
    "google_domains" = ps: with ps; [  ];
    "graphite" = ps: with ps; [  ];
    "group" = ps: with ps; [  ];
+    "hangouts" = ps: with ps; [  ];
+    "hangouts.config_flow" = ps: with ps; [  ];
+    "hangouts.const" = ps: with ps; [  ];
+    "hangouts.hangouts_bot" = ps: with ps; [  ];
    "hassio" = ps: with ps; [ aiohttp-cors ];
    "hassio.handler" = ps: with ps; [  ];
    "hassio.http" = ps: with ps; [  ];
@ -463,6 +468,7 @@
    "input_number" = ps: with ps; [  ];
    "input_select" = ps: with ps; [  ];
    "input_text" = ps: with ps; [  ];
+    "insteon" = ps: with ps; [  ];
    "insteon_local" = ps: with ps; [  ];
    "insteon_plm" = ps: with ps; [  ];
    "intent_script" = ps: with ps; [  ];
@ -502,8 +508,7 @@
    "light.hyperion" = ps: with ps; [  ];
    "light.iglo" = ps: with ps; [  ];
    "light.ihc" = ps: with ps; [  ];
-    "light.insteon_local" = ps: with ps; [  ];
-    "light.insteon_plm" = ps: with ps; [  ];
+    "light.insteon" = ps: with ps; [  ];
    "light.isy994" = ps: with ps; [  ];
    "light.knx" = ps: with ps; [  ];
    "light.lifx" = ps: with ps; [  ];
@ -692,6 +697,7 @@
    "notify.free_mobile" = ps: with ps; [  ];
    "notify.gntp" = ps: with ps; [  ];
    "notify.group" = ps: with ps; [  ];
+    "notify.hangouts" = ps: with ps; [  ];
    "notify.hipchat" = ps: with ps; [  ];
    "notify.html5" = ps: with ps; [ aiohttp-cors ];
    "notify.instapush" = ps: with ps; [  ];
@ -893,7 +899,7 @@
    "sensor.imap" = ps: with ps; [ aioimaplib ];
    "sensor.imap_email_content" = ps: with ps; [  ];
    "sensor.influxdb" = ps: with ps; [ influxdb ];
-    "sensor.insteon_plm" = ps: with ps; [  ];
+    "sensor.insteon" = ps: with ps; [  ];
    "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
    "sensor.iota" = ps: with ps; [  ];
    "sensor.iperf3" = ps: with ps; [  ];
@ -932,9 +938,11 @@
    "sensor.nederlandse_spoorwegen" = ps: with ps; [  ];
    "sensor.nest" = ps: with ps; [  ];
    "sensor.netatmo" = ps: with ps; [  ];
+    "sensor.netatmo_public" = ps: with ps; [  ];
    "sensor.netdata" = ps: with ps; [  ];
    "sensor.netgear_lte" = ps: with ps; [  ];
    "sensor.neurio_energy" = ps: with ps; [  ];
+    "sensor.noaa_tides" = ps: with ps; [  ];
    "sensor.nsw_fuel_station" = ps: with ps; [  ];
    "sensor.nut" = ps: with ps; [  ];
    "sensor.nzbget" = ps: with ps; [  ];
@ -1113,8 +1121,7 @@
    "switch.hook" = ps: with ps; [  ];
    "switch.hydrawise" = ps: with ps; [  ];
    "switch.ihc" = ps: with ps; [  ];
-    "switch.insteon_local" = ps: with ps; [  ];
-    "switch.insteon_plm" = ps: with ps; [  ];
+    "switch.insteon" = ps: with ps; [  ];
    "switch.isy994" = ps: with ps; [  ];
    "switch.kankun" = ps: with ps; [  ];
    "switch.knx" = ps: with ps; [  ];
@ -1212,6 +1219,7 @@
    "vacuum" = ps: with ps; [  ];
    "vacuum.demo" = ps: with ps; [  ];
    "vacuum.dyson" = ps: with ps; [  ];
+    "vacuum.ecovacs" = ps: with ps; [  ];
    "vacuum.mqtt" = ps: with ps; [ paho-mqtt ];
    "vacuum.neato" = ps: with ps; [  ];
    "vacuum.roomba" = ps: with ps; [  ];
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -18,12 +18,14 @@ let

  defaultOverrides = [
    # Override the version of some packages pinned in Home Assistant's setup.py
-    (mkOverride "aiohttp" "3.3.2"
-      "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12")
+    (mkOverride "aiohttp" "3.4.0"
+      "9b15efa7411dcf3b59c1f4766eb16ba1aba4531a33e54d469ee22106eabce460")
    (mkOverride "astral" "1.6.1"
      "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d")
    (mkOverride "attrs" "18.1.0"
      "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")
+    (mkOverride "bcrypt" "3.1.4"
+      "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d")
    (mkOverride "pyjwt" "1.6.4"
      "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176")
    (mkOverride "cryptography" "2.3.1"
@ -73,7 +75,7 @@ let
  extraBuildInputs = extraPackages py.pkgs;

  # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.76.1";
+  hassVersion = "0.77.1";

 in with py.pkgs; buildPythonApplication rec {
  pname = "homeassistant";
@ -88,14 +90,14 @@ in with py.pkgs; buildPythonApplication rec {
    owner = "home-assistant";
    repo = "home-assistant";
    rev = version;
-    sha256 = "0bqvb6wsbv1irp92ijdvx62vqicsqhyk301ixf8yb2d1dwwwmid3";
+    sha256 = "1dqxxirglcl0srb4znwz61lxqba47g7q66bw4v1nfdwhxb0kj0w5";
  };

  propagatedBuildInputs = [
    # From setup.py
-    aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous
-    # From http, frontend, recorder and config.config_entries components
-    sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize
+    aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous
+    # From http, frontend, recorder and config.config_entries components and auth.mfa_modules.totp
+    sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize pyotp pyqrcode
  ] ++ componentBuildInputs ++ extraBuildInputs;

  checkInputs = [
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "home-assistant-frontend";
-  version = "20180818.0";
+  version = "20180829.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "b6101c342e49c943c59e3525d6741cd3a23af94b65549d59bdeee8cf3f07b294";
+    sha256 = "c3e1e3472760b6ebab5f73395e9fe332edf8bf6b0a30027fa68cf719fdb0df36";
  };

  propagatedBuildInputs = [ user-agents ];
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@ -1,40 +1,36 @@
-{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc, fetchpatch
+{ fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook
 , useSystemd ? true, systemd }:

 stdenv.mkDerivation rec {
  name = "rpcbind-${version}";
-  version = "0.2.4";
+  version = "1.2.5";

-  src = fetchurl {
-    url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7";
+  src = fetchgit {
+    url = "git://git.linux-nfs.org/projects/steved/rpcbind.git";
+    rev = "c0c89b3bf2bdf304a5fe3cab626334e0cdaf1ef2";
+    sha256 = "1k5rr0pia70ifyp877rbjdd82377fp7ii0sqvv18qhashr6489va";
  };

  patches = [
    ./sunrpc.patch
-    (fetchpatch {
-      name = "CVE-2017-8779.patch";
-      url = "https://raw.githubusercontent.com/guidovranken/rpcbomb/e6da9e489aa8ad000b0ad5ac9abc5b4eefc3a769/rpcbind_patch.txt";
-      sha256 = "0w231w8fxihgrn526np078j3vbj3ylvjvxjmfpjvqhga5zg821ab";
-    })
  ];

  buildInputs = [ libnsl libtirpc ]
             ++ stdenv.lib.optional useSystemd systemd;

  configureFlags = [
-    "--with-systemdsystemunitdir=${if useSystemd then "$(out)/etc/systemd/system" else "no"}"
+    "--with-systemdsystemunitdir=${if useSystemd then "${placeholder "out"}/etc/systemd/system" else "no"}"
    "--enable-warmstarts"
    "--with-rpcuser=rpc"
  ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];

  meta = with stdenv.lib; {
    description = "ONC RPC portmapper";
    license = licenses.bsd3;
    platforms = platforms.unix;
-    homepage = https://sourceforge.net/projects/rpcbind/;
+    homepage = https://linux-nfs.org/;
    maintainers = with maintainers; [ abbradar ];
    longDescription = ''
      Universal addresses to RPC program number mapper.
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@ -123,7 +123,9 @@ let
      inherit (hostPlatform)
        isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD
        isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
-      isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;
+      isArm = builtins.trace
+        "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
+        hostPlatform.isAarch32;

      # Whether we should run paxctl to pax-mark binaries.
      needsPax = isLinux;
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  name    = "bat-${version}";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner  = "sharkdp";
    repo   = "bat";
    rev    = "v${version}";
-    sha256 = "04ip0h1n7wavd7j7r7ppcy3v4987yv44mgw8qm8d56pcw67f9vwk";
+    sha256 = "19xmj3a3npx4v1mlvd31r3icml73mxjq6la5qifb2i35ciqnx9bd";
    fetchSubmodules = true;
  };

--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "bdf2psf-${version}";
-  version = "1.184";
+  version = "1.185";

  src = fetchurl {
    url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "0lyxiwm0586b8gyl13ks2rqqa6abkqaxc4i08hvwyza1k1cqm2jc";
+    sha256 = "0i8ppqj6yhdkvjkwfl588f2zpaybj61pq64bhlnmc8c4snwpn1z6";
  };

  buildInputs = [ dpkg ];
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@ -1,13 +1,13 @@
 GEM
  remote: http://rubygems.org/
  specs:
-    lolcat (99.9.11)
+    lolcat (99.9.19)
      manpages (~> 0.6.1)
      paint (~> 2.0.0)
-      trollop (~> 2.1.2)
+      trollop (~> 2.1.3)
    manpages (0.6.1)
    paint (2.0.1)
-    trollop (2.1.2)
+    trollop (2.1.3)

 PLATFORMS
  ruby
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@ -3,10 +3,10 @@
    dependencies = ["manpages" "paint" "trollop"];
    source = {
      remotes = ["http://rubygems.org"];
-      sha256 = "1z0j354sj2qm2srgz3i28s347fwylvv1j614806cr33zcd1j4mwp";
+      sha256 = "05zm92ad0ws9fklpz1xk94hy95argwana01c6rr2xbx2q4mcil9m";
      type = "gem";
    };
-    version = "99.9.11";
+    version = "99.9.19";
  };
  manpages = {
    source = {
@ -27,9 +27,9 @@
  trollop = {
    source = {
      remotes = ["http://rubygems.org"];
-      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+      sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
      type = "gem";
    };
-    version = "2.1.2";
+    version = "2.1.3";
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3696,7 +3696,7 @@ with pkgs;
    nodejs = pkgs.nodejs-6_x;
  };

-  nodePackages = nodePackages_6_x;
+  nodePackages = nodePackages_8_x;

  npm2nix = nodePackages.npm2nix;

@ -15899,6 +15899,8 @@ with pkgs;

  dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };

+  drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };
+
  droopy = callPackage ../applications/networking/droopy {
    inherit (python3Packages) wrapPython;
  };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -10356,12 +10356,16 @@ in {

  pyopencl = callPackage ../development/python-modules/pyopencl { };

+  pyotp = callPackage ../development/python-modules/pyotp { };
+
  pyproj = callPackage ../development/python-modules/pyproj {
    # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by
    # a few decimal places, so caveat emptor.
    proj = null;
  };

+  pyqrcode = callPackage ../development/python-modules/pyqrcode { };
+
  pyrr = callPackage ../development/python-modules/pyrr { };

  pysha3 = callPackage ../development/python-modules/pysha3 { };