Merge branch 'master' into staging

2016-12-29 13:56:16 +01:00 · 2016-12-29 13:56:16 +01:00 · 9d09bc6728
commit 9d09bc6728
parent e4f23bc8af c2d90eaa91
110 changed files with 2974 additions and 1094 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -129,6 +129,7 @@
  dochang = "Desmond O. Chang <dochang@gmail.com>";
  domenkozar = "Domen Kozar <domen@dev.si>";
  doublec = "Chris Double <chris.double@double.co.nz>";
+  dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
  drets = "Dmytro Rets <dmitryrets@gmail.com>";
  drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
  dtzWill = "Will Dietz <nix@wdtz.org>";
@ -331,6 +332,7 @@
  ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
  odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
  offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
+  oida = "oida <oida@posteo.de>";
  okasu = "Okasu <oka.sux@gmail.com>";
  olcai = "Erik Timan <dev@timan.info>";
  olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
@ -506,4 +508,5 @@
  zimbatm = "zimbatm <zimbatm@zimbatm.com>";
  zohl = "Al Zohali <zohl@fmap.me>";
  zoomulator = "Kim Simmons <zoomulator@gmail.com>";
+  zraexy = "David Mell <zraexy@gmail.com>";
 }
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@ -25,6 +25,6 @@ stdenv.mkDerivation {

      # Generate the squashfs image.
      mksquashfs nix-path-registration $storePaths $out \
-        -keep-as-directory -all-root -comp xz
+        -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%
    '';
 }
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@ -1,11 +1,15 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.

-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:

 {
  imports =
    [ ./installation-cd-base.nix
-      ../../profiles/minimal.nix
+    ];
+
+  environment.systemPackages =
+    [
+      pkgs.vim
    ];
 }
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -467,7 +467,7 @@
      ihaskell = 189;
      i2p = 190;
      lambdabot = 191;
-      #asterisk = 192; # unused
+      asterisk = 192;
      plex = 193;
      sabnzbd = 194;
      #grafana = 196; #unused
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@ -15,6 +15,15 @@ in {
      '';
    };

+    locate = mkOption {
+      type = types.package;
+      default = pkgs.findutils;
+      example = "pkgs.mlocate";
+      description = ''
+        The locate implementation to use
+      '';
+    };
+
    interval = mkOption {
      type = types.str;
      default = "02:15";
@ -77,7 +86,7 @@ in {
        script =
          ''
            mkdir -m 0755 -p $(dirname ${toString cfg.output})
-            exec updatedb \
+            exec ${cfg.locate}/bin/updatedb \
              --localuser=${cfg.localuser} \
              ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@ -45,7 +45,7 @@
  ];

  # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];

  # Configure host id for ZFS to work
  networking.hostId = lib.mkDefault "8425e349";
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@ -585,7 +585,7 @@ in {
        serviceConfig = {
          ExecStart = ''
            ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \
-              --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
+              --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
          '';
          User = "graphite";
          Group = "graphite";
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@ -62,8 +62,8 @@ in {
      };

      listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
+        type = types.str;
+        default = "";
        description = ''
          Address to listen on for the web interface and API.
        '';
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@ -6,29 +6,38 @@ let
  cfg = config.services.asterisk;

  asteriskUser = "asterisk";
+  asteriskGroup = "asterisk";

  varlibdir = "/var/lib/asterisk";
  spooldir = "/var/spool/asterisk";
  logdir = "/var/log/asterisk";

+  # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
+  defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
+  allConfFiles =
+    cfg.confFiles //
+    builtins.listToAttrs (map (x: { name = x;
+                                    value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })
+                              defaultConfFiles);
+
  asteriskEtc = pkgs.stdenv.mkDerivation
  ((mapAttrs' (name: value: nameValuePair
        # Fudge the names to make bash happy
        ((replaceChars ["."] ["_"] name) + "_")
        (value)
-      ) cfg.confFiles) //
+      ) allConfFiles) //
  {
    confFilesString = concatStringsSep " " (
-      attrNames cfg.confFiles
+      attrNames allConfFiles
    );

-    name = "asterisk.etc";
+    name = "asterisk-etc";

    # Default asterisk.conf file
    # (Notice that astetcdir will be set to the path of this derivation)
    asteriskConf = ''
      [directories]
-      astetcdir => @out@
+      astetcdir => /etc/asterisk
      astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
      astvarlibdir => /var/lib/asterisk
      astdbdir => /var/lib/asterisk
@ -169,6 +178,16 @@ in
        '';
      };

+      useTheseDefaultConfFiles = mkOption {
+        default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ];
+        type = types.listOf types.str;
+        example = [ "sip.conf" "dundi.conf" ];
+        description = ''Sets these config files to the default content. The default value for
+          this option contains all necesscary files to avoid errors at startup.
+          This does not override settings via <option>services.asterisk.confFiles</option>.
+        '';
+      };
+
      extraArguments = mkOption {
        default = [];
        type = types.listOf types.str;
@ -182,12 +201,22 @@ in
  };

  config = mkIf cfg.enable {
-    users.extraUsers = singleton
-    { name = asteriskUser;
-      uid = config.ids.uids.asterisk;
-      description = "Asterisk daemon user";
-      home = varlibdir;
-    };
+    environment.systemPackages = [ pkgs.asterisk ];
+
+    environment.etc.asterisk.source = asteriskEtc;
+
+    users.extraUsers.asterisk =
+      { name = asteriskUser;
+        group = asteriskGroup;
+        uid = config.ids.uids.asterisk;
+        description = "Asterisk daemon user";
+        home = varlibdir;
+      };
+
+    users.extraGroups.asterisk =
+      { name = asteriskGroup;
+        gid = config.ids.gids.asterisk;
+      };

    systemd.services.asterisk = {
      description = ''
@ -196,14 +225,17 @@ in

      wantedBy = [ "multi-user.target" ];

+      # Do not restart, to avoid disruption of running calls. Restart unit by yourself!
+      restartIfChanged = false;
+
      preStart = ''
        # Copy skeleton directory tree to /var
        for d in '${varlibdir}' '${spooldir}' '${logdir}'; do
          # TODO: Make exceptions for /var directories that likely should be updated
          if [ ! -e "$d" ]; then
            mkdir -p "$d"
-            cp --recursive ${pkgs.asterisk}/"$d" "$d"
-            chown --recursive ${asteriskUser} "$d"
+            cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/
+            chown --recursive ${asteriskUser}:${asteriskGroup} "$d"
            find "$d" -type d | xargs chmod 0755
          fi
        done
@ -215,7 +247,9 @@ in
            # FIXME: This doesn't account for arguments with spaces
            argString = concatStringsSep " " cfg.extraArguments;
          in
-          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F";
+          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
+        ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"
+          '';
        Type = "forking";
        PIDFile = "/var/run/asterisk/asterisk.pid";
      };
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@ -34,6 +34,7 @@ let

      ###### implementation
      config = mkIf cfg.enable {
+        environment.systemPackages = [ pkg ];
        systemd.services.${variant} = {
          description = "BIRD Internet Routing Daemon";
          wantedBy = [ "multi-user.target" ];
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@ -6,7 +6,12 @@ let

  cfg = config.services.crowd;

-  pkg = pkgs.atlassian-crowd;
+  pkg = pkgs.atlassian-crowd.override {
+    home = cfg.home;
+    port = cfg.listenPort;
+    proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
+    openidPassword = cfg.openidPassword;
+  };

 in

@ -45,6 +50,11 @@ in
        description = "Port to listen on.";
      };

+      openidPassword = mkOption {
+        type = types.str;
+        description = "Application password for OpenID server.";
+      };
+
      catalinaOptions = mkOption {
        type = types.listOf types.str;
        default = [];
@ -119,10 +129,10 @@ in
      };

      preStart = ''
-        mkdir -p ${cfg.home}/{logs,work}
+        mkdir -p ${cfg.home}/{logs,work,database}

        mkdir -p /run/atlassian-crowd
-        ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd
+        ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd

        chown -R ${cfg.user} ${cfg.home}

@ -134,7 +144,6 @@ in
      '';

      script = "${pkg}/start_crowd.sh";
-      #stopScript  = "${pkg}/bin/stop_crowd.sh";

      serviceConfig = {
        User = cfg.user;
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@ -22,7 +22,7 @@ in
          which will make Xorg reconfigure the device ?

          If you're not satisfied by the default behaviour you can override
-          <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in
+          <option>environment.etc."X11/xorg.conf.d/70-wacom.conf"</option> in
          configuration.nix easily.
        '';
      };
@ -40,7 +40,7 @@ in

    services.udev.packages = [ pkgs.xf86_input_wacom ];

-    environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";
+    environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf";

  };

--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@ -0,0 +1,89 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+}:
+
+let
+  arch =
+    if stdenv.system == "i686-linux" then "i686"
+    else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
+    else if stdenv.system == "armv7l-linux" then "armv7l"
+    else throw "ImageMagick is not supported on this platform.";
+
+  cfg = {
+    version = "7.0.4-0";
+    sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";
+    patches = [];
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "imagemagick-${version}";
+  inherit (cfg) version;
+
+  src = fetchurl {
+    urls = [
+      "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
+      # the original source above removes tarballs quickly
+      "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+      "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
+    ];
+    inherit (cfg) sha256;
+  };
+
+  patches = [ ./imagetragick.patch ] ++ cfg.patches;
+
+  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+  outputMan = "out"; # it's tiny
+
+  enableParallelBuilding = true;
+
+  configureFlags =
+    [ "--with-frozenpaths" ]
+    ++ [ "--with-gcc-arch=${arch}" ]
+    ++ lib.optional (librsvg != null) "--with-rsvg"
+    ++ lib.optionals (ghostscript != null)
+      [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
+        "--with-gslib"
+      ]
+    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+      [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
+    ;
+
+  nativeBuildInputs = [ pkgconfig libtool ];
+
+  buildInputs =
+    [ zlib fontconfig freetype ghostscript
+      libpng libtiff libxml2
+    ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ openexr librsvg openjpeg ]
+    ;
+
+  propagatedBuildInputs =
+    [ bzip2 freetype libjpeg lcms2 ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ libX11 libXext libXt libwebp ]
+    ;
+
+  postInstall = ''
+    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    moveToOutput "bin/*-config" "$dev"
+    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+    for file in "$dev"/bin/*-config; do
+      substituteInPlace "$file" --replace pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
+    done
+  '' + lib.optionalString (ghostscript != null) ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.imagemagick.org/;
+    description = "A software suite to create, edit, compose, or convert bitmap images";
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ the-kenny wkennington ];
+  };
+}
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@ -11,8 +11,8 @@ let
    else throw "ImageMagick is not supported on this platform.";

  cfg = {
-    version = "6.9.6-7";
-    sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5";
+    version = "6.9.7-0";
+    sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";
    patches = [];
  }
    # Freeze version on mingw so we don't need to port the patch too often.
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@ -13,8 +13,10 @@ stdenv.mkDerivation rec {

  buildInputs = [
    ghostscript atk gtk2 glib fontconfig freetype
-    libgnomecanvas libgnomeprint libgnomeprintui
+    libgnomecanvas
    pango libX11 xproto zlib poppler
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+    libgnomeprint libgnomeprintui
  ];

  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
@ -47,11 +49,11 @@ stdenv.mkDerivation rec {
      cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
  '';

-  meta = {
+  meta = with stdenv.lib; {
    homepage = http://xournal.sourceforge.net/;
    description = "Note-taking application (supposes stylus)";
-    maintainers = [ stdenv.lib.maintainers.guibert ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.guibert ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
  };
 }
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+let version = "0.6.1"; in
+stdenv.mkDerivation {
+  name = "confclerk-${version}";
+
+  src = fetchurl {
+    url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
+    sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g";
+  };
+
+  buildInputs = [ qt4 ];
+
+  nativeBuildInputs = [ qmake4Hook ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/bin/confclerk $out/bin
+  '';
+
+  meta = {
+    description = "Offline conference schedule viewer";
+    homepage = "http://www.toastfreeware.priv.at/confclerk";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ ehmry ];
+    inherit (qt4.meta) platforms;
+  };
+}
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, qtbase, qtwebengine
+, qmakeHook }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.5rc2";
+  name = "qsyncthingtray-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sieren";
+    repo = "QSyncthingTray";
+    rev = "${version}";
+    sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2";
+  };
+
+  buildInputs = [ qtbase qtwebengine ];
+  nativeBuildInputs = [ qmakeHook ];
+  enableParallelBuilding = true;
+  
+  postInstall = ''
+    mkdir -p $out/bin
+    cp binary/QSyncthingTray $out/bin
+    cat > $out/bin/qt.conf <<EOF
+    [Paths]
+    Prefix = ${qtwebengine.out}
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sieren/QSyncthingTray/;
+    description = "A Traybar Application for Syncthing written in C++";
+    longDescription = ''
+        A cross-platform status bar for Syncthing.
+        Currently supports OS X, Windows and Linux.
+        Written in C++ with Qt.
+    '';
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ zraexy ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, w3m, file, less }:

 pythonPackages.buildPythonApplication rec {
-  name = "ranger-1.7.2";
+  name = "ranger-1.8.0";

  meta = {
    description = "File manager with minimalistic curses interface";
@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {

  src = fetchurl {
    url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
+    sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
  };

  propagatedBuildInputs = [ file ];
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@ -1,19 +1,28 @@
-{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }:
+{ stdenv, fetchurl, pythonPackages, pango, keybinder, vte, gettext, intltool, file
+}:

 pythonPackages.buildPythonApplication rec {
  name = "terminator-${version}";
-  version = "0.98";
-  
+  version = "1.0";
+
  src = fetchurl {
    url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
+    sha256 = "1pfspcxsbax8a835kcld32fax6vcxsn1fmkny9zzvi4icplhkal8";
  };
-  
-  propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ];

-  #setupPyBuildFlags = [ "--without-icon-cache" ];
+  nativeBuildInputs = [ file intltool ];

-  doCheck = false;
+  pythonPath = with pythonPackages; [
+    pygtk pygobject2 vte keybinder notify gettext pango psutil
+  ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  checkPhase = ''
+    ./run_tests
+  '';

  meta = with stdenv.lib; {
    description = "Terminal emulator with support for tiling and tabs";
@ -25,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
    '';
    homepage = http://gnometerminator.blogspot.no/p/introduction.html;
    license = licenses.gpl2;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor globin ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "urlscan-${version}";
+  version = "0.8.3";
+
+  src = fetchFromGitHub {
+    owner = "firecat53";
+    repo = "urlscan";
+    rev = version;
+    # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")
+    sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";
+  };
+
+  propagatedBuildInputs = [ urwid ];
+
+  # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
+  disabled = !pythonOlder "3.5";
+
+  meta = with stdenv.lib; {
+    description = "Mutt and terminal url selector (similar to urlview)";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dpaetzel ];
+  };
+}
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@ -5,6 +5,7 @@
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which
+, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@ -19,7 +20,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;

 let

-common = { pname, version, sha512 }: stdenv.mkDerivation rec {
+common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
  name = "${pname}-unwrapped-${version}";

  src = fetchurl {
@ -135,7 +136,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
  };

  passthru = {
-    inherit nspr version;
+    inherit nspr version updateScript;
    gtk = gtk2;
    isFirefox3Like = true;
    browserName = "firefox";
@ -148,13 +149,22 @@ in {
  firefox-unwrapped = common {
    pname = "firefox";
    version = "50.1.0";
-    sha512 = "2jwpk3aymkcq9f4xhzc31sb1c90vy3dvyqq2hvw97vk9dw7rgvv2cki10ns5cshbc4k57yd3j8nm7ppy2kw6na6771mj6sbijdjw39p";
+    sha512 = "370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5";
+    updateScript = import ./update.nix {
+        name = "firefox";
+        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+    };
  };

  firefox-esr-unwrapped = common {
    pname = "firefox-esr";
    version = "45.6.0esr";
-    sha512 = "086ci461hmz6kdn0ly9dlc723gc117si4a11a1c51gh79hczhahdaxg5s4r3k59rb43gpwxrlvm4wx1aka36bsihnh8a4caxnp72v5r";
+    sha512 = "b96c71aeed8a1185a085512f33d454a1735237cd9ddf37c8caa9cc91892eafab0615fc0ca6035f282ca8101489fa84c0de1087d1963c05b64df32b0c86446610";
+    updateScript = import ./update.nix {
+        name = "firefox-esr";
+        versionSuffix = "esr";
+        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+    };
  };

 }
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@ -0,0 +1,54 @@
+{ name
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
+, curl
+, ed
+, sourceSectionRegex ? "${name}-unwrapped = common"
+, basePath ? "pkgs/applications/networking/browsers/firefox"
+, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
+, versionSuffix ? ""
+}:
+
+let
+  version = (builtins.parseDrvName name).version;
+in writeScript "update-${name}" ''
+  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${ed}/bin
+
+  pushd ${basePath}
+
+  url=${baseUrl}
+
+  # retriving latest released version
+  #  - extracts all links from the $url
+  #  - extracts lines only with number and dots followed by a slash
+  #  - removes trailing slash
+  #  - sorts everything with semver in mind
+  #  - picks up latest release
+  version=`xidel -q $url --extract "//a" | \
+           grep "^[0-9.]*${versionSuffix}/$" | \
+           sed s/[/]$// | \
+           sort --version-sort | \
+           tail -n 1`
+
+  shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
+
+  ed default.nix <<COMMANDS
+  # search line
+    /${sourceSectionRegex}/
+  # search version number line
+    /version/
+  # update the version
+    s/".*"/"$version"/
+  # search hash line
+    /sha512/
+  # update the hash
+    s/".*"/"$shasum"/
+  # write then quit
+    wq
+  COMMANDS
+
+  popd
+''
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@ -51,10 +51,13 @@ let
    flac harfbuzz icu libpng opusWithCustomModes snappy speechd
    bzip2 libcap
  ] ++ optional pulseSupport libpulseaudio;
+
+  suffix = if channel != "stable" then "-" + channel else "";
+
 in stdenv.mkDerivation rec {
  inherit version;

-  name = "google-chrome-${version}";
+  name = "google-chrome${suffix}-${version}";

  src = binary;

--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitLab }:
+
+buildGoPackage rec {
+  name = "mm-${version}";
+  version = "2016.11.04";
+
+  goPackagePath = "gitlab.com/meutraa/mm";
+
+  src = fetchFromGitLab {
+    owner = "meutraa";
+    repo = "mm";
+    rev = "473fdd97285168054b672dbad2ffc4047324c518";
+    sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+  };
+
+  meta = {
+    description = "A file system based matrix client";
+    homepage = https://gitlab.com/meutraa/mm;
+    license = stdenv.lib.licenses.isc;
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "ricochet-${version}";
-  version = "1.1.2";
+  version = "1.1.4";

  src = fetchurl {
    url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";
-    sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr";
+    sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf";
  };

  desktopItem = makeDesktopItem {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    description = "Anonymous peer-to-peer instant messaging";
    homepage = "https://ricochet.im";
    license = licenses.bsd3;
-    maintainers = [ maintainers.codsl maintainers.jgillich ];
+    maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@ -1,585 +1,585 @@
 {
-  version = "45.5.1";
+  version = "45.6.0";
  sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ar/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ar/thunderbird-45.6.0.tar.bz2";
      locale = "ar";
      arch = "linux-x86_64";
-      sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1";
+      sha512 = "7a2976d272ecc0a3727e34b0841865fea6de9f05195089aa912831836c6f74b9fd34de0ed327cf96cf5b8c0e39829e2db5dd364a92e4ffc48e7139a0fd9cf066";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ast/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ast/thunderbird-45.6.0.tar.bz2";
      locale = "ast";
      arch = "linux-x86_64";
-      sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d";
+      sha512 = "fcb1efd553617825e5ca55afe56a6e36cd8a0c067f4e851c6527058fe1b8169da2e548932e21bc7a52eacec9fa2c55b0cc1369a850a9927ba6c686ed6f5940e6";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/be/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/be/thunderbird-45.6.0.tar.bz2";
      locale = "be";
      arch = "linux-x86_64";
-      sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d";
+      sha512 = "7ca8e07771a984510f2114bcf58397e49e6d64013dfba94e3312ad926e05afb01dc5beced22e5c00f0e43d742752f8a96b5ef167f4d892a01fbaedc194b76d49";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bg/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bg/thunderbird-45.6.0.tar.bz2";
      locale = "bg";
      arch = "linux-x86_64";
-      sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3";
+      sha512 = "fe717fc5590f420e13a0c8bedba031b8ed5e2379ddf613fc14d82f718afe9341d953baf4f056fca88366248a5f3777cbcc3c12e5bccc33ac07698d3de8306370";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bn-BD/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bn-BD/thunderbird-45.6.0.tar.bz2";
      locale = "bn-BD";
      arch = "linux-x86_64";
-      sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3";
+      sha512 = "9e87ff7976eed19137767b0e9ee2b43b41701edc060201da8d54c68d40f26d88f07c3972d59d59e74191bf30163eec642d6b72f7e633fe48d5cc34f1624d7983";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/br/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/br/thunderbird-45.6.0.tar.bz2";
      locale = "br";
      arch = "linux-x86_64";
-      sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794";
+      sha512 = "2c829c85255d15aa6ad9a941404290a546dbe7522877bfc0b9869415e6f806f853252bb646650d8a9f9729cfd139121dceafc4c1c052030ff7ff7b17e9cef4c3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ca/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ca/thunderbird-45.6.0.tar.bz2";
      locale = "ca";
      arch = "linux-x86_64";
-      sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4";
+      sha512 = "452f701dd496fe6da40372188f7db2628cbe9b7db737b167d052a4dd75c668fb2505e68b6ec299b8a9d0e4cb448a57f8805aabd0d898e21cb67e89eba0163014";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cs/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cs/thunderbird-45.6.0.tar.bz2";
      locale = "cs";
      arch = "linux-x86_64";
-      sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743";
+      sha512 = "2574febad30bf072d7a0674ff821ca35845d6a5fda09cfce9cff18960af210ded42370bd148324e3599b14977cea770e59e8425c1bf0e6a52824c52f0a864457";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cy/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cy/thunderbird-45.6.0.tar.bz2";
      locale = "cy";
      arch = "linux-x86_64";
-      sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795";
+      sha512 = "f07456acf596b6e3e98586177ebe41cdc09a7476c465371153062b394f0e89a0bf17ead255375cd0616c2db063dce3ac9aeba8d29f7e5906fc1c323000b49f22";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/da/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/da/thunderbird-45.6.0.tar.bz2";
      locale = "da";
      arch = "linux-x86_64";
-      sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760";
+      sha512 = "7bda2aeb26814fc9b2b1afb4470ec17f0b069b779e99ddd3ee423ac3776ca47d23223009cd35d2f6e495e7b5523787a228fa55db6e56f0c724b45e5ba2bac9d4";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/de/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/de/thunderbird-45.6.0.tar.bz2";
      locale = "de";
      arch = "linux-x86_64";
-      sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1";
+      sha512 = "7a9c629f957c74e54c2e82912836fc1f2688f37ceee43a31b29d1d4b9b2c477e7ebff3f4b4969386e7aee458215f22a76ede4abba9138fd8d64411a0bd7103d3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/dsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/dsb/thunderbird-45.6.0.tar.bz2";
      locale = "dsb";
      arch = "linux-x86_64";
-      sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8";
+      sha512 = "666a64764cbd0f216f9b960f78b1e45d63c008332efd93b9e233842f37478d9c0f2d1faac494a5b28d43ff21a9e01059fa8b46554d05f47d919483b6d63befab";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/el/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/el/thunderbird-45.6.0.tar.bz2";
      locale = "el";
      arch = "linux-x86_64";
-      sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3";
+      sha512 = "02a7f06adfb93ee1694e0389e01b6bd2fe51e5e2379cf3c0fd34b8c7c8d7f58a848679fae19a7cea851bbfcf96fae493a020701841b2753678a142e3925b56e8";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-GB/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-GB/thunderbird-45.6.0.tar.bz2";
      locale = "en-GB";
      arch = "linux-x86_64";
-      sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095";
+      sha512 = "1e45378d32c04db6b802480e245663f3c4522105da6c548d6ff1e5eebead55f53322909b87ecf0b97b85fab30b684ef8e9f3c0175a033824bccadffbb42cad7f";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-US/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-US/thunderbird-45.6.0.tar.bz2";
      locale = "en-US";
      arch = "linux-x86_64";
-      sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a";
+      sha512 = "ab06b894f881ebc847cdcc11ffabcf7d9b626da9ce17c4195e7c401963bb3937b8a05eb73ea2fb988662f318568af3ad7142d3fc556cfe139d4393249c353446";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-AR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-AR/thunderbird-45.6.0.tar.bz2";
      locale = "es-AR";
      arch = "linux-x86_64";
-      sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049";
+      sha512 = "07be1c0f88aa49a8264bfccbc6db3e738dcde83d93f86939bf3ffb5f85c835252f2f4a74a8cb3eb5d2ea6a1b4af31d3d84418090a23be36aa11965cd4ed67b66";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-ES/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-ES/thunderbird-45.6.0.tar.bz2";
      locale = "es-ES";
      arch = "linux-x86_64";
-      sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531";
+      sha512 = "2c51ff6931dea175ad6d8eb64c768792f61bef1cb5762efa3e7261cbf14c7619c81ef44a8d6e1ebe7d9764d2608b85e6ddbe47ec437f500c65037d6be8341d88";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/et/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/et/thunderbird-45.6.0.tar.bz2";
      locale = "et";
      arch = "linux-x86_64";
-      sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641";
+      sha512 = "e726a397cecb1d624fef5840b89a177591c8a10d397042b2c5f47574d9b88d0725a1b53999e2d268a67c4efd1b4551ffa2052398c1ad14903a8b0217b5b353bc";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/eu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/eu/thunderbird-45.6.0.tar.bz2";
      locale = "eu";
      arch = "linux-x86_64";
-      sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf";
+      sha512 = "85c2fdc7e27a8298d8e553f221595ae0d7872eae4e78d143d533a18582d8f40195db38f179aa2ed558e790fb7c58510a8ad6037c698ab149d3bd582e34528e5c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fi/thunderbird-45.6.0.tar.bz2";
      locale = "fi";
      arch = "linux-x86_64";
-      sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979";
+      sha512 = "ad4516f11670424d31e7fc5c9b12bcf1f0c63110b81ab45a3c5b5a897e1d0a3ce1855117254902ca177a04fc422c193c742098a431dbd8b760bdefe1d7c4c6a3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fr/thunderbird-45.6.0.tar.bz2";
      locale = "fr";
      arch = "linux-x86_64";
-      sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a";
+      sha512 = "4abb3fd8430867262811a4aa56304666ad6a1336959afff73fcdc38f157505975d6c340219db4980157f38dcb4b2596cdf623f311f6fbd29e613a89bed35beca";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fy-NL/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fy-NL/thunderbird-45.6.0.tar.bz2";
      locale = "fy-NL";
      arch = "linux-x86_64";
-      sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c";
+      sha512 = "dddab8f7453bfc074f3cd8d6aea33402f66be1bec08ea7c152873af63c802e03edf01e74db236dac6e088f836f188258d3dc62fefa833ffc525ca15b71cfbf21";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ga-IE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ga-IE/thunderbird-45.6.0.tar.bz2";
      locale = "ga-IE";
      arch = "linux-x86_64";
-      sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716";
+      sha512 = "66acfc92a997ef6a2f1dfdf6a6952eebd7788b14d3080867349619b3f9559bbac4cfe6e983ad87900e089a0cb15dab2b9f77dcac69adb66ef0f97f9b5cc4e809";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gd/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gd/thunderbird-45.6.0.tar.bz2";
      locale = "gd";
      arch = "linux-x86_64";
-      sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8";
+      sha512 = "e4d2fefb8e7c0c14395af7f695e216f6fdb685ca150cb803a347228aaea988169a7093747e770921716123a9333bbc00560e6324ff2f4f966cd895c2fbe6e21d";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gl/thunderbird-45.6.0.tar.bz2";
      locale = "gl";
      arch = "linux-x86_64";
-      sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c";
+      sha512 = "6cc628399fa0adce0fe740e77a8e708988f7dee4d004bcb785fe567ca680fca79fde756e479cab9017828cebe48fa091e402d52d6bed54aae9cc5b6e28f246d8";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/he/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/he/thunderbird-45.6.0.tar.bz2";
      locale = "he";
      arch = "linux-x86_64";
-      sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83";
+      sha512 = "82bbf5a5fe84953d9118948fe3e9d4d6a46ceaafe42f76ea3dda36134458d30f0c73f2ab61682d2627b8c3d598d2174d549d8b4b80bf5c3071627b57b713329a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hr/thunderbird-45.6.0.tar.bz2";
      locale = "hr";
      arch = "linux-x86_64";
-      sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af";
+      sha512 = "c70dcfc8506132ce0764de325c8e0debafdc8460052bfa4901172f880b935d1c0bd70b1f7d227604f6bfd155c2ff165c1ad7a5b509d512483b54eff80e910a1a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hsb/thunderbird-45.6.0.tar.bz2";
      locale = "hsb";
      arch = "linux-x86_64";
-      sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3";
+      sha512 = "5baeaa2ae960514551d062979cd60644971b6603ab33b9773a3eff10e267f0029b2edd5d48734dfcf99697ec77c88e12f4f240ea18a7433a0a2eb07f70283389";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hu/thunderbird-45.6.0.tar.bz2";
      locale = "hu";
      arch = "linux-x86_64";
-      sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed";
+      sha512 = "bbba8bfef9168efcf0aca6fa98596b3d7bbfaf456ceca263825d2f96b054d6dbc672e1086db645a48966f82cd0d6f4c85e9846935dc7b2595faeefa81c66904f";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hy-AM/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hy-AM/thunderbird-45.6.0.tar.bz2";
      locale = "hy-AM";
      arch = "linux-x86_64";
-      sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de";
+      sha512 = "b58088defd9a2f76aa779bf080135a5735e1531de065b1a3ac6f9048266e763bee8a22be634f435584d308aa5a532b72687bbddc8f7dedaca39642ed04137bfa";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/id/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/id/thunderbird-45.6.0.tar.bz2";
      locale = "id";
      arch = "linux-x86_64";
-      sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c";
+      sha512 = "c83198b8ac60132f3124253c082ea0d5a45f1db7a7a6509ea18e3d084e26796364e6ced3c20675620cfc7f849b4e7fe342c86d0cea24eee48c815dc02730074f";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/is/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/is/thunderbird-45.6.0.tar.bz2";
      locale = "is";
      arch = "linux-x86_64";
-      sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335";
+      sha512 = "285427b6f53c181889b78d005071f71211a2a51b6fa5f3eaf5a573a4a5e15cd83d946b97f3da89d383fd797a6985f8c1d589fe40e1267a73224848080af9b79c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/it/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/it/thunderbird-45.6.0.tar.bz2";
      locale = "it";
      arch = "linux-x86_64";
-      sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793";
+      sha512 = "5e763b01fce3bb3ce5deaea0d3e4bb51b5cd752ab5fa191a064400f7961d237924b98013179f0d32017bc527478d665d6fbc74482680aaf041444d3c376497ae";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ja/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ja/thunderbird-45.6.0.tar.bz2";
      locale = "ja";
      arch = "linux-x86_64";
-      sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526";
+      sha512 = "7dd7b1f9fcfe103d8b70587e2a8307bec93766b504390ee138cab52bb8b8f76759af84568eccc71e5a88ee8cf3e326313930760cc92267ecf7e0fb29fc09f8e8";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ko/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ko/thunderbird-45.6.0.tar.bz2";
      locale = "ko";
      arch = "linux-x86_64";
-      sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449";
+      sha512 = "1776ae557e7f7d6df013d178a68f969aee4da9de6049f0055e290a808da61af4bd712d7915ac05a04c159db93fab7d994bd0317a471dc0498c2b5c0b8696cf71";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/lt/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/lt/thunderbird-45.6.0.tar.bz2";
      locale = "lt";
      arch = "linux-x86_64";
-      sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4";
+      sha512 = "499a710619b3e9f86fe7e77e35ddbfece5609af92d79b50b697ea8539cd0b198ec88702a7c19a9169cdb2b1dead19fe786d0af16bc6fe2b9f3e0414780a1e1e9";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nb-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nb-NO/thunderbird-45.6.0.tar.bz2";
      locale = "nb-NO";
      arch = "linux-x86_64";
-      sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d";
+      sha512 = "d97a5f532a000f3cf44e1b741a3a7026d07bf2c6012b4f6361021b81058aa93876304014d3d8d7181695c526cfd887523e217b7b502c493f5327bb4ba4d00461";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nl/thunderbird-45.6.0.tar.bz2";
      locale = "nl";
      arch = "linux-x86_64";
-      sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab";
+      sha512 = "06df0ab52f6a9916bef1605283c7669a1afbe5ce7f6bed5746673ad5ad222034333bb41a6a1d81e87165105e3493d095bc90c5a910cb48041042367972dd9d61";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nn-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nn-NO/thunderbird-45.6.0.tar.bz2";
      locale = "nn-NO";
      arch = "linux-x86_64";
-      sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5";
+      sha512 = "3509fbcb2955b226d869e43812665c7d2752956f68cff8cd4df3dbb3d0bda2b060218ede3eb9fdae285ed6765ce89c720793f905e09a97d6d22c2e36db890261";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pa-IN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pa-IN/thunderbird-45.6.0.tar.bz2";
      locale = "pa-IN";
      arch = "linux-x86_64";
-      sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea";
+      sha512 = "b113f1134df372dd4d369eb9d4c9c30dfe15fc8d65c153ca2087a6ce3ade368554ea2e9561b7d4642f7ec52247071bb323649e884ebd89b8472bc046c1e3be5e";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pl/thunderbird-45.6.0.tar.bz2";
      locale = "pl";
      arch = "linux-x86_64";
-      sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9";
+      sha512 = "4ea27afc66451ba40c8cfa22930598925dc18b4b074ab190d8c8866d0f516e9887e8c006ec1564b490a79f67b0b2c88d3fdfa616727e36bf705d780af82a27f3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-BR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-BR/thunderbird-45.6.0.tar.bz2";
      locale = "pt-BR";
      arch = "linux-x86_64";
-      sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c";
+      sha512 = "263ac30d26e20733eb332c6ae6837e3ebe7b8c41ff1cc15e47951f22e89873a620218e9caa2a3cfb74a93e619575a4812b362d4908372fd3ce05406d7ef295d5";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-PT/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-PT/thunderbird-45.6.0.tar.bz2";
      locale = "pt-PT";
      arch = "linux-x86_64";
-      sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7";
+      sha512 = "90ed68c12871e11165f9357a1e836fe8cf872bf654303c07e26f1bf30979d756e9fe6f034b4265d8f22fe8d31853ba76a983a8c7fe3759d7793f904f8cd0f788";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/rm/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/rm/thunderbird-45.6.0.tar.bz2";
      locale = "rm";
      arch = "linux-x86_64";
-      sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed";
+      sha512 = "ba6aa5a07a06e57a4241f1e9962f4a28b4221032b8b3220cbfec2f3675f808367c586da0fba987e7d1309bb3bcc4d2ed48ea8ef98a6f4a3e65d4fd9fe06c527d";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ro/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ro/thunderbird-45.6.0.tar.bz2";
      locale = "ro";
      arch = "linux-x86_64";
-      sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1";
+      sha512 = "caeecf69a9da3dfeb2c3ef8b0d8733e81e32ac201c0c5b60206160d47172863c91f2a0fddf3e7d2f707918934467c01a0dbbe1f63e3859a7106974b3a5f084a8";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ru/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ru/thunderbird-45.6.0.tar.bz2";
      locale = "ru";
      arch = "linux-x86_64";
-      sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8";
+      sha512 = "22727502ca4dec94470a71456c19ffd7f01b75118480ae67ed4849510bf77c8ec1359ddb0233e41c1b1dbad219ad5111d0b11c6c7ae7258ec10167f27b08f197";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/si/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/si/thunderbird-45.6.0.tar.bz2";
      locale = "si";
      arch = "linux-x86_64";
-      sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081";
+      sha512 = "b872fb53f0380f77dd4dd87ccde7151db206adaa81801aa907db398df1a51bf3ae65510c452b035cf71c9000dd949106c9d64f44cbde7f1419cc41e403ac6d29";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sk/thunderbird-45.6.0.tar.bz2";
      locale = "sk";
      arch = "linux-x86_64";
-      sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c";
+      sha512 = "32b1e962e7e4e6aa8d198e080a09b43d21cb307bb8a3af50fc7170748604ce3b6f96b5f59b56b5c0edd61f7af31ccec9446aac50ef9eb94e5ef7a48c71e99541";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sl/thunderbird-45.6.0.tar.bz2";
      locale = "sl";
      arch = "linux-x86_64";
-      sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a";
+      sha512 = "c9192435795c677aae642884e773362d17e5afd8e5943e2759d1486e4ca5bddb35be3c99a4b6869aa7018db4bffa09f0b63e500eb26a00cd35c141543eec0a00";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sq/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sq/thunderbird-45.6.0.tar.bz2";
      locale = "sq";
      arch = "linux-x86_64";
-      sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b";
+      sha512 = "2150abcdded45107ce54ee58f55bbb78f9fdd0fae143fe423e14f4debfa4819c23b021c8d4d36dfe606e206d3dc3deda0671cd08f6d82f7ceca7e7591e7df3a6";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sr/thunderbird-45.6.0.tar.bz2";
      locale = "sr";
      arch = "linux-x86_64";
-      sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3";
+      sha512 = "a9bdf3062d72095d080ad309f25bb8aa27635d3497fd99e6982ae3ba635f61c97e66fe9aefb88466f6f22c6e691692d70abe00c10294353d88fc288111dad6f1";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sv-SE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sv-SE/thunderbird-45.6.0.tar.bz2";
      locale = "sv-SE";
      arch = "linux-x86_64";
-      sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc";
+      sha512 = "4353836558baf234d4dd3376a6262ac0af576f16d725c71ec5eb994a72599e748d2334cb916a3050db8f719aa68f2f9d7204aaa4a41ff9da339db933fb64d496";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ta-LK/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ta-LK/thunderbird-45.6.0.tar.bz2";
      locale = "ta-LK";
      arch = "linux-x86_64";
-      sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f";
+      sha512 = "9f4c8192c6d683325efcfed3d5ccea7218e2eaf3193ccde00be8542f13e8b3771d2a3690ff212cabaef067452f72061fb47a8184ef16fdf59d687e3b760126a5";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/tr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/tr/thunderbird-45.6.0.tar.bz2";
      locale = "tr";
      arch = "linux-x86_64";
-      sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6";
+      sha512 = "12f567a390f44a79af8615f677b87164d74172f7540ebe6d08023e017576493b0da5a63c466ffc2c3a4c406b0d9e8753e00aaa45dd1acb751621cbb8d9e53415";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/uk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/uk/thunderbird-45.6.0.tar.bz2";
      locale = "uk";
      arch = "linux-x86_64";
-      sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8";
+      sha512 = "844e7ee825d304ae19edfbd4c324ba11c2037c9a97fc96f8b99da7fc3ad0137d3106069fdfb06814d2df20a75c6051416b52448ec56980858c70110676294f90";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/vi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/vi/thunderbird-45.6.0.tar.bz2";
      locale = "vi";
      arch = "linux-x86_64";
-      sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d";
+      sha512 = "35c0fee2083c922284fc11a048150d53a343fe7980160d2c4cf2046e588056457b4e5876dfceb51b79a828886d9671a1934d51079c6d1e64e9af979927d9d8db";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-CN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-CN/thunderbird-45.6.0.tar.bz2";
      locale = "zh-CN";
      arch = "linux-x86_64";
-      sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7";
+      sha512 = "039cb44b4e07fdaf6d9b1eb717baf798b3f3a3cf8726ce97b4fa7ab7e938b9365158597747e406916ae35150c9cf96af74590c5189a64ddfbf65740c1cd45c5c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-TW/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-TW/thunderbird-45.6.0.tar.bz2";
      locale = "zh-TW";
      arch = "linux-x86_64";
-      sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f";
+      sha512 = "4721eed25de2cc71728d7cee651fdf51ef5b791873a3e59df2720c0f46269bf375e0e9456024ca4ec9ca31f8178b5af704e2fa9cb057860fa46b72ff4b22970c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ar/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ar/thunderbird-45.6.0.tar.bz2";
      locale = "ar";
      arch = "linux-i686";
-      sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8";
+      sha512 = "e149770dd3229d3a00e56cd34848afbb1ff6765e66da4fa449156dc58c6990bd35e442ea8c14cf90e63541a34fbcfec8d8714350186e863ded72391b60622c69";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ast/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ast/thunderbird-45.6.0.tar.bz2";
      locale = "ast";
      arch = "linux-i686";
-      sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107";
+      sha512 = "3bf557b9e9ce9f4b84e3407dfed2fbaaa280893033d4bee0724543b6951e0533050b8feeb0a01b4693140815ced705a5ef16e800d149f967bb39329dcbecb5f7";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/be/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/be/thunderbird-45.6.0.tar.bz2";
      locale = "be";
      arch = "linux-i686";
-      sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66";
+      sha512 = "ace07c8982b68ed259b344aab73790fc9f90f98f39b65a57c6be7463c3918d545c4a0a6ff6df5b8ef7b7b07ae44c7e69a1bfa84c7cc82b9dd62bba075a2a113c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bg/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bg/thunderbird-45.6.0.tar.bz2";
      locale = "bg";
      arch = "linux-i686";
-      sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88";
+      sha512 = "fed2ed25fe530939c4116daa3a3a09075812b005a937c36cab385bfb867d703a84feef50e2006f83009a25c0736c9b032c17605b2364d8fde4799d1e9f479b8c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bn-BD/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bn-BD/thunderbird-45.6.0.tar.bz2";
      locale = "bn-BD";
      arch = "linux-i686";
-      sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47";
+      sha512 = "84190d0cc6884f14ccf4ce06dbd69193f90591becd5d8064ea89c7ec12ec411bf766bff1bc5d5c6f142fa53ed2b9ce494718f7d32a74a027819de32381b24526";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/br/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/br/thunderbird-45.6.0.tar.bz2";
      locale = "br";
      arch = "linux-i686";
-      sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283";
+      sha512 = "619857fadb8721ccf103a3739a1336e2cafbfa62a0a2ab074254481d50f0d301f7718d47b5a3d42922fa562f1382de2aa8b5256bc62d829400926a494bc19403";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ca/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ca/thunderbird-45.6.0.tar.bz2";
      locale = "ca";
      arch = "linux-i686";
-      sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7";
+      sha512 = "3314b1129be6ce854a6b028849167af5f93c289073f962f5de09eb37fc7a2c40eb75b8b361289c879c4b7f752170f05a01dc6ae996bba4a5b706c1deb037cfc4";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cs/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cs/thunderbird-45.6.0.tar.bz2";
      locale = "cs";
      arch = "linux-i686";
-      sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d";
+      sha512 = "07d21c5f4aef38b9f7b330bf0c06f10ba3fc7cfeedcdd45e45ffb9ad4e5b1f729cb5d249028a87a8ce122da96c240447a6eed4be2220e302a2c55ac39cb1628a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cy/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cy/thunderbird-45.6.0.tar.bz2";
      locale = "cy";
      arch = "linux-i686";
-      sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721";
+      sha512 = "b2f86ed9ebfd8124611f6d9e20cf36322e36cecc2fea688649b9f6df231d65ed4cad192e12b7a27367b3b7706e510c5547c5bb22aedab76d420540cea9b81ee5";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/da/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/da/thunderbird-45.6.0.tar.bz2";
      locale = "da";
      arch = "linux-i686";
-      sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34";
+      sha512 = "00ef125afcb33ebd5f11b765c9c3ea9e3e240e3416d00012cbf1b82377f8d610ab2b4aac800d7a0ae0f443447840b35d92e58600d83dfb6c6dd76e8ecabd3924";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/de/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/de/thunderbird-45.6.0.tar.bz2";
      locale = "de";
      arch = "linux-i686";
-      sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0";
+      sha512 = "05e1cae57b9a2e2fb274c2efc130e596c5f6c35ce14055156f728a662e9f8f5423a42708629726e0a70e3420aeb1d9b3b224c019cbbaa6f4a0cee69f78c740ac";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/dsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/dsb/thunderbird-45.6.0.tar.bz2";
      locale = "dsb";
      arch = "linux-i686";
-      sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c";
+      sha512 = "dd0dadb02dd11dc9c39c6aa67eb995b786fdec47e966cb79177bde56400300b214ba90509a50ad839b36908da18829eb02431a4e1cae3e878dcb3debed258bc1";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/el/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/el/thunderbird-45.6.0.tar.bz2";
      locale = "el";
      arch = "linux-i686";
-      sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd";
+      sha512 = "12fc5fe4fb9fcccc295cd05c46850dab1ebfa81e0fc1ea073c493ef7c8db73e2c96999e9b1a29cda8f8cfa5437920f8a6b88d3b6911fd88dfde2673563e2afc1";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-GB/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-GB/thunderbird-45.6.0.tar.bz2";
      locale = "en-GB";
      arch = "linux-i686";
-      sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8";
+      sha512 = "0e195cd68923d8b8bedb4028d17b08d029eecc82d0b40de575b55d573dda6227684043cf50c959c790746a6b38089e02cc996cc8a23cb31011c6fe4c3fd2ae89";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-US/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-US/thunderbird-45.6.0.tar.bz2";
      locale = "en-US";
      arch = "linux-i686";
-      sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32";
+      sha512 = "d3ceea1ef1e3562d682882b14f518f917143e4c4417ac07e8a474c52a57ccf0169fe1580355dcda0710e03c67b46eeb78fd59b31b831b8f431ef1a0cd9a37c2e";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-AR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-AR/thunderbird-45.6.0.tar.bz2";
      locale = "es-AR";
      arch = "linux-i686";
-      sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d";
+      sha512 = "19a3703f4f3fc5ce82ac8f69468fabb494ff663ed0b507af4a7cb74fcfefc5eb7e8090771392a800cbec88897c9c00315b457289eb1be860e1b47dff2f25a5d3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-ES/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-ES/thunderbird-45.6.0.tar.bz2";
      locale = "es-ES";
      arch = "linux-i686";
-      sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69";
+      sha512 = "706987651522f9c843c8771a4e58c474661da8a45104e1dfdd1b72be74c3a43d9eaaf4f9eb3661718c4237515afc90272c535579d0db1fa3715a29d03bef36af";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/et/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/et/thunderbird-45.6.0.tar.bz2";
      locale = "et";
      arch = "linux-i686";
-      sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5";
+      sha512 = "3ec0d0fa4ab85a3ce958b8c637e4d208f803e861f3b544d3f15a79ac1e1704efa963eb127f1687cbe5f4e75926bf1731bd9fd781a6e7fdda07035766eba8d39d";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/eu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/eu/thunderbird-45.6.0.tar.bz2";
      locale = "eu";
      arch = "linux-i686";
-      sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf";
+      sha512 = "54eaeebfce0f0c805954be911c3ac666993d9bf927ccdb01ce0f322524451523ccb7d6d8fee473eebd9cac14d6653655de8f0e6861f8d4fb0953658cd808b74e";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fi/thunderbird-45.6.0.tar.bz2";
      locale = "fi";
      arch = "linux-i686";
-      sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19";
+      sha512 = "51d09e9b7ecbf4891ceee5fde9fe00ce2ac9cbf4a2fc0a3f1433e7004677d6fc35067734c3f0506362b346953423f71844937c1187db9194ebe952adad1abef6";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fr/thunderbird-45.6.0.tar.bz2";
      locale = "fr";
      arch = "linux-i686";
-      sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a";
+      sha512 = "0c3b9635cf107cdfb91c4cdc4771c25b112fd7d87341c88259a5670c5fa716e105cb910b1b6b85d8c22d518abba5a538f87250c8bb34c71df4cb98bf7026f8be";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fy-NL/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fy-NL/thunderbird-45.6.0.tar.bz2";
      locale = "fy-NL";
      arch = "linux-i686";
-      sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e";
+      sha512 = "45adb1b96d4d57c5302ca373f193b5a7e0a9f8577fabcb37c184bc8aaa66cdd4b0136e810af0ca8f1a7727fd51d60ee1006f6dc3e5fd182ff45056fc923d7d13";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ga-IE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ga-IE/thunderbird-45.6.0.tar.bz2";
      locale = "ga-IE";
      arch = "linux-i686";
-      sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de";
+      sha512 = "4c3453566e747b57f94ef980a7d9b4d2a1c5b78584b0bcf1eea4d8c6b26ca177f18cf94811e5301a12e7de8939a11bbebe202683449b367f29a391a94d020cb1";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gd/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gd/thunderbird-45.6.0.tar.bz2";
      locale = "gd";
      arch = "linux-i686";
-      sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3";
+      sha512 = "ba0f0ee9c8a2a64c414e1621c8d5ce47194ef144f026e3306cf2c81d214fd0e1df541fea11dfdc2de7629cdc8ba2a4aaccb16dc7cc0c3404925177b893ca5d73";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gl/thunderbird-45.6.0.tar.bz2";
      locale = "gl";
      arch = "linux-i686";
-      sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea";
+      sha512 = "f1d948b366842bfc2fd349ccae3c6c9f586fd69e99f0a0f9804bf3bff25ce6262451513952ad30f128626bffd6f9719d377868fb7d2fa56d8b6f54b2f4751ea8";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/he/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/he/thunderbird-45.6.0.tar.bz2";
      locale = "he";
      arch = "linux-i686";
-      sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e";
+      sha512 = "1e0f048b272b4927d19f66390577ae2a37a32dadc24e36a7cdfd48e4257db09f5433c2812429c1700a5fa1f3630deb3c43db316de921d8e9be58f41388d2502d";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hr/thunderbird-45.6.0.tar.bz2";
      locale = "hr";
      arch = "linux-i686";
-      sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f";
+      sha512 = "a821b66d67f32c84d0bf4172fb82ee487c13703122821042b00739890777573288c31c5178f4dfb6fce587eb58a19eaccd6f23b4b8f3d851fc203293674fb510";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hsb/thunderbird-45.6.0.tar.bz2";
      locale = "hsb";
      arch = "linux-i686";
-      sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5";
+      sha512 = "c756ae475fc1964ae915a68313411ec8ab4a7d4744685de2ffeaaae33d58fcc08712657a2f030b1b358d02d9653c26478515ecbd915881e33cdaca9d9842fb38";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hu/thunderbird-45.6.0.tar.bz2";
      locale = "hu";
      arch = "linux-i686";
-      sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454";
+      sha512 = "d2f68c86f57fb9351c5c2ba74a8976bc89810634dbf5a521c34a553ccb6ff27eaf66fdc92e50c0f226246e9fc25316d4305feea1c3801513f418f58dff1955bd";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hy-AM/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hy-AM/thunderbird-45.6.0.tar.bz2";
      locale = "hy-AM";
      arch = "linux-i686";
-      sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245";
+      sha512 = "42ad523ad7f30638a69d8d549491af06ab9f740f8eb0b81e681236a09ce39de3758e2af61f2857293d085603f3530df3edaa23c19a014034528d3d130517fcef";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/id/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/id/thunderbird-45.6.0.tar.bz2";
      locale = "id";
      arch = "linux-i686";
-      sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa";
+      sha512 = "42a023e474e440b8201dbe5caaa7354546f89d5e4e9fcd34152dae93349bab8872f6060e5029fa629fd9853999ecf08688e51a2d9a16400265bc5c61a9abf783";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/is/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/is/thunderbird-45.6.0.tar.bz2";
      locale = "is";
      arch = "linux-i686";
-      sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a";
+      sha512 = "6fe784f65ee584a1fb9fdc962be412e09ff43e88afa29365ddabf6a237ae7a1c854c05d5e3b3bbef83653fae94646c7a32144c2f7907304573b5f71e5f978ac9";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/it/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/it/thunderbird-45.6.0.tar.bz2";
      locale = "it";
      arch = "linux-i686";
-      sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841";
+      sha512 = "dae36c69bfa5cc80ad9489c76acdc6094f5fcd2c41f8c2f5dcd5d8d103aca564daaa96b27426f8096aaf555b6786f7d2c2227cbf1096d7eae53285b337d8221c";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ja/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ja/thunderbird-45.6.0.tar.bz2";
      locale = "ja";
      arch = "linux-i686";
-      sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9";
+      sha512 = "c33ba443ee0556b28b60ba4517913d54a931cc2b63339262b35a1d576166e9abe1e7f6297f11683397a13f5c7b71cd96f97e60ad1a956aa27ba9fbd7f0c5fb43";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ko/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ko/thunderbird-45.6.0.tar.bz2";
      locale = "ko";
      arch = "linux-i686";
-      sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57";
+      sha512 = "0587a7bb7218b16c859717e99a3fd96e697b3a32dd322361edfbaf0b069522914e84b74160466d3b25fac76d925af485b9688fb5a3e072f1eff94dabb0239669";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/lt/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/lt/thunderbird-45.6.0.tar.bz2";
      locale = "lt";
      arch = "linux-i686";
-      sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912";
+      sha512 = "0789f1357a0c2a61fa676c9c375c79c29e78c3b3bf8faa2a392ec90714e1e581bd07eb75628284e6873c66553c613e7b43a18532a01cc66510f0bdcbef5f5b83";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nb-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nb-NO/thunderbird-45.6.0.tar.bz2";
      locale = "nb-NO";
      arch = "linux-i686";
-      sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92";
+      sha512 = "906ebc96274cc490b82b434f648ba33f16a4f2b641e99142fcf18cd24701ed0b4b34558b2b380a0ff1d4ebe253ffd99d6b2cf4b9cf059a3f071c9e3bee94dd0b";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nl/thunderbird-45.6.0.tar.bz2";
      locale = "nl";
      arch = "linux-i686";
-      sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf";
+      sha512 = "d18b521eddf0e71cecb33473275bb44038717cefadddc648441b0d4c7a01aaa08e45fad28e3eb74e8d01d1a637db1ef4d999d45a83c2fcb3aa3e7430b73b666f";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nn-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nn-NO/thunderbird-45.6.0.tar.bz2";
      locale = "nn-NO";
      arch = "linux-i686";
-      sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821";
+      sha512 = "66f7b07352f7a6064d3a805d8d348ae4956240b42359a2d3fbd1d96291a025e1f4920ddcb0cd9312e1d8f146fcceae4e0d9811a9e6ae43479307aa204d8de8d3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pa-IN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pa-IN/thunderbird-45.6.0.tar.bz2";
      locale = "pa-IN";
      arch = "linux-i686";
-      sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397";
+      sha512 = "828e57876a063979f945d0cee371b57e43d2f26eba4723a8983b448b85a091a303da068f17ba73f1eb23b35e06d9b3a37b56d9a3be49c202c950d2bd2ed9db05";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pl/thunderbird-45.6.0.tar.bz2";
      locale = "pl";
      arch = "linux-i686";
-      sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102";
+      sha512 = "6ca824649b5f030423213dd573018af5b6a8033fa86b6b23c5b99e59afdd5234cd2c7a8237124dabbf75175511afff980dd3d971f59967c3522b633680d7277a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-BR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-BR/thunderbird-45.6.0.tar.bz2";
      locale = "pt-BR";
      arch = "linux-i686";
-      sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da";
+      sha512 = "399dc86d31375ea3af21e6032b686ffdec65a3c0ca403d95bc89e0e7715e6c998dc846057ff4a6b919fda794a9fdabb53eafd7a07d8894a65e1109c9c52e43d1";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-PT/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-PT/thunderbird-45.6.0.tar.bz2";
      locale = "pt-PT";
      arch = "linux-i686";
-      sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7";
+      sha512 = "f758fb69c99c02fe1bcab8c9a4b02eeebcc190c30e73f4b009521c36956cc7f076e1f544181a332807bee93ec39d7d170cca3f0d87fc6ed89b60a4515c394749";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/rm/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/rm/thunderbird-45.6.0.tar.bz2";
      locale = "rm";
      arch = "linux-i686";
-      sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109";
+      sha512 = "d338c243cbfa41e5b54195923bc12876e45683271df477d492058973dbc0f7352d59863a3bde571ab001612b8ce5704512f1bc0ad1e8af066f7aa448b5c89f0a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ro/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ro/thunderbird-45.6.0.tar.bz2";
      locale = "ro";
      arch = "linux-i686";
-      sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3";
+      sha512 = "2c011b2cef9c5761c1297b2cc2dcd442ae9fd8d0f28d0f469aa2abbd6da80fe11bd607df8fb224ff03bd21932bdd40591532722756c467b498313da0f639c3fc";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ru/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ru/thunderbird-45.6.0.tar.bz2";
      locale = "ru";
      arch = "linux-i686";
-      sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27";
+      sha512 = "90fe536806f6e2ec20c470c72812ff8e54af58499ba220f9b6a5b6043c3a6072c78dc834c4204ca4e1f9d5ab71093296c958fe12409e50435136903f3ea3d544";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/si/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/si/thunderbird-45.6.0.tar.bz2";
      locale = "si";
      arch = "linux-i686";
-      sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309";
+      sha512 = "36fed4f969775870a3e224aef66b36d8b8f1adec2471b4b45d75c52318b9481bdd81a9f583589b4c5450045e4a8abff91f3fb9083f4bafd237c742015626291f";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sk/thunderbird-45.6.0.tar.bz2";
      locale = "sk";
      arch = "linux-i686";
-      sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39";
+      sha512 = "e89ac23a25ae446f69e9c31478cc844253ba57de01893bd12b6b2bbe0e599fa09bf1506e9cfcbeab506998d81bc170fe1cff2d0e9aa13411299a5441d40d8959";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sl/thunderbird-45.6.0.tar.bz2";
      locale = "sl";
      arch = "linux-i686";
-      sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c";
+      sha512 = "6a74cc252d64d6d11a98af51e8fffc8a4bba8c74e2647afee9cfaae55ffcabe7ef9d82ee95a1a4d169fc057025c84f1253f455c6bd5e8f5fb9e33d7372c96a01";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sq/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sq/thunderbird-45.6.0.tar.bz2";
      locale = "sq";
      arch = "linux-i686";
-      sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05";
+      sha512 = "2ab4b18e5560eb495093aa0e5867f6e91148fe1cf7123f50306cb19b646b0834cde8cbd449df46f7e12b597465ee69910ad386e9920e26cdadc2085ca92e7af9";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sr/thunderbird-45.6.0.tar.bz2";
      locale = "sr";
      arch = "linux-i686";
-      sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff";
+      sha512 = "dc23ac3a9c3fc8b0105bdac2b14f24a0cd76b7f6c3bcd3994d979ef2db44a9f11bc2e5648148bd45008ea832261399898737b39727c0a61a03b8315aeede6bde";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sv-SE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sv-SE/thunderbird-45.6.0.tar.bz2";
      locale = "sv-SE";
      arch = "linux-i686";
-      sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6";
+      sha512 = "ebcac4ddcb84291613eeb64289e1f9f374a6085eb587df3cffc906dd7d7950f7564be1aed17c794d37f415840459b82c0c6edebefab2d8ba6f3e34c20426757a";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ta-LK/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ta-LK/thunderbird-45.6.0.tar.bz2";
      locale = "ta-LK";
      arch = "linux-i686";
-      sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a";
+      sha512 = "b164c7e70aa313517ecd85828a3734113f504f7e86ae615a24465a4334f41197af42b181f1f0048782d841422c3847eff1b8868450d190e362a36ffb5d1f2b6d";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/tr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/tr/thunderbird-45.6.0.tar.bz2";
      locale = "tr";
      arch = "linux-i686";
-      sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de";
+      sha512 = "6c3d65c4c277382961238e491f90e0f33a265614614428f2abeeb3779cc3b23b068d8ddf7f4a7c98a4c7497b22df79b3ba16ef0191b9cfb752aa24316d4fb8e3";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/uk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/uk/thunderbird-45.6.0.tar.bz2";
      locale = "uk";
      arch = "linux-i686";
-      sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88";
+      sha512 = "6754bead8887f244c6d87a6c76f45247933fae42fc74240c453bbef8acfa7a85ba282db4185c1fb6ec9e93115e3d9e4ac0ee113c00db9634f26a4eec6f79ea6b";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/vi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/vi/thunderbird-45.6.0.tar.bz2";
      locale = "vi";
      arch = "linux-i686";
-      sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41";
+      sha512 = "34110501557ea23c1c854fbba9e6c043e25634f5993f34197b8d5842ee88d4717c87a0a8fe326a35dd12e74fcfbf9ddb0b6e7db0b09a058d710680e37cd5b939";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-CN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-CN/thunderbird-45.6.0.tar.bz2";
      locale = "zh-CN";
      arch = "linux-i686";
-      sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510";
+      sha512 = "493073bee16e9e22db0d3c2700f13f1304129c28528a80fb9a548afbabaaa147b7ac46a254cc3b05619d47e94e61c29ff7cc80618c8af09b3659e6c91883c017";
    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-TW/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-TW/thunderbird-45.6.0.tar.bz2";
      locale = "zh-TW";
      arch = "linux-i686";
-      sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3";
+      sha512 = "7ac66a0ee967e7f87d084acda72120c65bb64c2572f42249b97baf9755b0b7dc314a1d88049941a7be86846f98f236cdfe54b87b22ff7f66b6099397788373b2";
    }
    ];
 }
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@ -4,6 +4,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu
+, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
  # instead of "Earlybird", enable this option.  However, those
@ -13,7 +14,7 @@
  enableOfficialBranding ? false
 }:

-let version = "45.5.1"; in
+let version = "45.6.0"; in
 let verName = "${version}"; in

 stdenv.mkDerivation rec {
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7";
+    sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
  };

  buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
@ -128,4 +129,12 @@ stdenv.mkDerivation rec {
    maintainers = [ maintainers.pierron maintainers.eelco ];
    platforms = platforms.linux;
  };
+
+  passthru.updateScript = import ./../../browsers/firefox/update.nix {
+    name = "thunderbird";
+    sourceSectionRegex = ".";
+    basePath = "pkgs/applications/networking/mailreaders/thunderbird";
+    baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
+    inherit writeScript xidel coreutils gnused gnugrep curl ed;
+  };
 }
--- a/pkgs/applications/science/misc/gplates/boostfix.patch
+++ b/pkgs/applications/science/misc/gplates/boostfix.patch
@ -0,0 +1,612 @@
+--- a/src/app-logic/ApplicationState.h
+++ b/src/app-logic/ApplicationState.h
+@@ -33,6 +33,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "LayerTaskRegistry.h"
+@@ -48,6 +49,7 @@
+ #include "model/ModelInterface.h"
+ #include "model/types.h"
+ #include "model/WeakReferenceCallback.h"
+#endif
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers
+--- a/src/app-logic/CoRegistrationLayerTask.h
+++ b/src/app-logic/CoRegistrationLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
+#ifndef Q_MOC_RUN
+ #include "CoRegistrationLayerParams.h"
+ #include "CoRegistrationLayerProxy.h"
+ #include "LayerTask.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
+#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/app-logic/RasterLayerTask.h
+++ b/src/app-logic/RasterLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "RasterLayerParams.h"
+ #include "RasterLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructGraph.h
+++ b/src/app-logic/ReconstructGraph.h
+@@ -46,6 +46,7 @@
+ #include <boost/lambda/construct.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "Reconstruction.h"
+@@ -53,6 +54,7 @@
+ 
+ #include "model/FeatureCollectionHandle.h"
+ #include "model/WeakReferenceCallback.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructLayerTask.h
+++ b/src/app-logic/ReconstructLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+ #include "ReconstructLayerParams.h"
+@@ -42,6 +43,7 @@
+ #include "maths/types.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h
+++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h
+@@ -30,6 +30,7 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ReconstructScalarCoverageParams.h"
+@@ -38,6 +39,7 @@
+ #include "property-values/ValueObjectType.h"
+ 
+ #include "utils/SubjectObserverToken.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h
+++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h
+@@ -30,12 +30,14 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructScalarCoverageLayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ScalarCoverageFeatureProperties.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/TopologyNetworkResolverLayerTask.h
+++ b/src/app-logic/TopologyNetworkResolverLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+@@ -41,6 +42,7 @@
+ #include "TopologyNetworkResolverLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h
+++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h
+@@ -32,9 +32,11 @@
+ #include <QObject>
+ #include <QString>
+ 
+#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "VelocityFieldCalculatorLayerParams.h"
+ #include "VelocityFieldCalculatorLayerProxy.h"
+#endif
+ 
+ #include "model/FeatureCollectionHandle.h"
+ 
+--- a/src/data-mining/CoRegConfigurationTable.h
+++ b/src/data-mining/CoRegConfigurationTable.h
+@@ -28,6 +28,7 @@
+ 
+ #include <vector>
+ #include <map>
+#ifndef Q_MOC_RUN
+ #include <boost/operators.hpp>
+ 
+ #include "CoRegFilter.h"
+@@ -44,6 +45,7 @@
+ #include "scribe/Transcribe.h"
+ #include "scribe/TranscribeContext.h"
+ 
+#endif
+ 
+ namespace GPlatesDataMining
+ {
+--- a/src/gui/CommandServer.h
+++ b/src/gui/CommandServer.h
+@@ -38,9 +38,11 @@
+ #include <QRegExp>
+ #include <QtXml/QXmlStreamReader>
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ 
+ #include "presentation/ViewState.h"
+#endif
+ 
+ namespace GPlatesGui
+ {
+--- a/src/gui/FeatureTableModel.h
+++ b/src/gui/FeatureTableModel.h
+@@ -32,8 +32,10 @@
+ #include <QItemSelection>
+ #include <QHeaderView>
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
+ #include "app-logic/ReconstructionGeometry.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/gui/TopologyTools.h
+++ b/src/gui/TopologyTools.h
+@@ -35,6 +35,7 @@
+ #include <QDebug>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "TopologySectionsContainer.h"
+ 
+ #include "app-logic/Layer.h"
+@@ -64,6 +65,7 @@
+ #include "utils/UnicodeStringUtils.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/opengl/GLVisualLayers.h
+++ b/src/opengl/GLVisualLayers.h
+@@ -35,6 +35,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "GLAgeGridMaskSource.h"
+ #include "GLContext.h"
+ #include "GLLight.h"
+@@ -79,6 +80,7 @@
+ 
+ #include "view-operations/RenderedGeometry.h"
+ #include "view-operations/ScalarField3DRenderParameters.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayer.h
+++ b/src/presentation/VisualLayer.h
+@@ -32,6 +32,7 @@
+ #include <QString>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "VisualLayerParams.h"
+ #include "VisualLayerType.h"
+ 
+@@ -42,6 +43,7 @@
+ #include "model/FeatureCollectionHandle.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayers.h
+++ b/src/presentation/VisualLayers.h
+@@ -34,6 +34,7 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "VisualLayer.h"
+ 
+ #include "app-logic/FeatureCollectionFileState.h"
+@@ -42,6 +43,7 @@
+ #include "gui/Symbol.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
+++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
+@@ -39,6 +39,7 @@
+ #include "GPlatesDialog.h"
+ #include "InformationDialog.h"
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/AssignPlateIds.h"
+ 
+ #include "file-io/File.h"
+@@ -47,6 +48,7 @@
+ #include "model/ModelInterface.h"
+ 
+ #include "presentation/VisualLayer.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
+++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
+@@ -38,6 +38,7 @@
+ 
+ #include "OpenDirectoryDialog.h"
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "app-logic/Layer.h"
+ #include "app-logic/LayerInputChannelName.h"
+@@ -45,6 +46,7 @@
+ 
+ #include "data-mining/CheckAttrTypeVisitor.h"
+ #include "data-mining/CoRegConfigurationTable.h"
+#endif
+ 
+ #include "global/PointerTraits.h"
+ 
+--- a/src/qt-widgets/CoRegistrationOptionsWidget.h
+++ b/src/qt-widgets/CoRegistrationOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include "CoRegistrationLayerConfigurationDialog.h"
+ #include "CoRegistrationOptionsWidgetUi.h"
+ #include "LayerOptionsWidget.h"
+#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialog.h"
+ 
+ #include "app-logic/CoRegistrationLayerTask.h"
+@@ -41,7 +42,7 @@
+ #include "file-io/File.h"
+ 
+ #include "presentation/VisualLayer.h"
+-
+#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/CoRegistrationResultTableDialog.h
+++ b/src/qt-widgets/CoRegistrationResultTableDialog.h
+@@ -36,6 +36,7 @@
+ #include <QEvent>
+ #include <qevent.h>
+ 
+#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialogUi.h"
+ #include "SaveFileDialog.h"
+ 
+@@ -43,6 +44,7 @@
+ #include "data-mining/OpaqueDataToQString.h"
+ 
+ #include "presentation/VisualLayer.h"
+#endif
+ 
+ namespace GPlatesPresentation
+ {
+--- a/src/qt-widgets/DrawStyleDialog.h
+++ b/src/qt-widgets/DrawStyleDialog.h
+@@ -33,6 +33,7 @@
+ #include <QMutex>
+ #include <QMutexLocker>
+ 
+#ifndef Q_MOC_RUN
+ #include "DrawStyleDialogUi.h"
+ #include "GPlatesDialog.h"
+ #include "PythonArgumentWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/PythonConfiguration.h"
+ 
+ #include "presentation/Application.h"
+#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/EditTableActionWidget.h
+++ b/src/qt-widgets/EditTableActionWidget.h
+@@ -27,8 +27,11 @@
+ #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H
+ 
+ #include <QWidget>
+
+#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "EditTableActionWidgetUi.h"
+#endif
+ 
+ namespace GPlatesQtWidgets
+ {
+--- a/src/qt-widgets/GlobeCanvas.h
+++ b/src/qt-widgets/GlobeCanvas.h
+@@ -41,6 +41,7 @@
+ #include <QPainter>
+ #include <QtOpenGL/qgl.h>
+ 
+#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Globe.h"
+ #include "gui/ViewportZoom.h"
+@@ -58,6 +59,7 @@
+ #include "qt-widgets/SceneView.h"
+ 
+ #include "view-operations/RenderedGeometryFactory.h"
+#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/LogDialog.h
+++ b/src/qt-widgets/LogDialog.h
+@@ -34,7 +34,9 @@
+ #include "GPlatesDialog.h"
+ #include "LogDialogUi.h"
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapCanvas.h
+++ b/src/qt-widgets/MapCanvas.h
+@@ -39,6 +39,7 @@
+ #include <QSize>
+ #include <QTransform>
+ 
+#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Map.h"
+ #include "gui/TextOverlay.h"
+@@ -47,6 +48,7 @@
+ #include "opengl/GLMatrix.h"
+ #include "opengl/GLOffScreenContext.h"
+ #include "opengl/GLVisualLayers.h"
+#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapView.h
+++ b/src/qt-widgets/MapView.h
+@@ -36,6 +36,7 @@
+ #include <QGLWidget>
+ #include <QMouseEvent>
+ 
+#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ 
+ #include "maths/LatLonPoint.h"
+@@ -44,6 +45,7 @@
+ #include "opengl/GLVisualLayers.h"
+ 
+ #include "qt-widgets/SceneView.h"
+#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MergeReconstructionLayersDialog.h
+++ b/src/qt-widgets/MergeReconstructionLayersDialog.h
+@@ -33,7 +33,9 @@
+ 
+ #include "MergeReconstructionLayersDialogUi.h"
+ 
+#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/RasterLayerOptionsWidget.h
+++ b/src/qt-widgets/RasterLayerOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include <QString>
+ #include <QToolButton>
+ 
+#ifndef Q_MOC_RUN
+ #include "RasterLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -40,6 +41,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
+++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
+@@ -28,6 +28,7 @@
+ 
+ #include <utility>
+ 
+#ifndef Q_MOC_RUN
+ #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -37,6 +38,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
+++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <QSlider>
+ 
+#ifndef Q_MOC_RUN
+ #include "ScalarField3DLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/RasterColourPalette.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/TotalReconstructionPolesDialog.h
+++ b/src/qt-widgets/TotalReconstructionPolesDialog.h
+@@ -32,12 +32,14 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QDialog>
+ 
+#ifndef Q_MOC_RUN
+ #include "TotalReconstructionPolesDialogUi.h"
+ 
+ #include "GPlatesDialog.h"
+ #include "SaveFileDialog.h"
+ 
+ #include "presentation/VisualLayer.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/VisualLayersComboBox.h
+++ b/src/qt-widgets/VisualLayersComboBox.h
+@@ -32,8 +32,10 @@
+ #include <QComboBox>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "presentation/VisualLayer.h"
+ #include "presentation/VisualLayerType.h"
+#endif
+ 
+ 
+ namespace GPlatesPresentation
+--- a/src/qt-widgets/VisualLayerWidget.h
+++ b/src/qt-widgets/VisualLayerWidget.h
+@@ -36,11 +36,13 @@
+ #include <QMenu>
+ #include <QStackedWidget>
+ 
+#ifndef Q_MOC_RUN
+ #include "VisualLayerWidgetUi.h"
+ 
+ #include "app-logic/Layer.h"
+ 
+ #include "gui/Colour.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/InternalGeometryBuilder.h
+++ b/src/view-operations/InternalGeometryBuilder.h
+@@ -30,9 +30,11 @@
+ #include <vector>
+ #include <boost/optional.hpp>
+ 
+#ifndef Q_MOC_RUN
+ #include "maths/GeometryOnSphere.h"
+ #include "maths/GeometryType.h"
+ #include "maths/PointOnSphere.h"
+#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryCollection.h
+++ b/src/view-operations/RenderedGeometryCollection.h
+@@ -39,7 +39,9 @@
+ #include <boost/foreach.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "RenderedGeometryLayer.h"
+#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryFactory.h
+++ b/src/view-operations/RenderedGeometryFactory.h
+@@ -33,6 +33,7 @@
+ #include <QString>
+ #include <QFont>
+ 
+#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ #include "RenderedColouredEdgeSurfaceMesh.h"
+ #include "RenderedColouredTriangleSurfaceMesh.h"
+@@ -62,6 +63,7 @@
+ #include "property-values/TextContent.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
+#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/RenderedGeometryLayer.h
+++ b/src/view-operations/RenderedGeometryLayer.h
+@@ -35,10 +35,12 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
+#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ 
+ #include "maths/CubeQuadTreeLocation.h"
+ 
+#endif
+ 
+ namespace GPlatesMaths
+ {
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "gplates-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+    sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
+  };
+
+  patches = [
+    ./boostfix.patch
+  ];
+
+  buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop software for the interactive visualisation of plate-tectonics";
+    homepage = https://www.gplates.org;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@ -5,21 +5,19 @@

 stdenv.mkDerivation rec {
  name = "cgit-${version}";
-  version = "0.12";
+  version = "1.1";

  src = fetchurl {
    url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
+    sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";
  };

  # cgit is tightly coupled with git and needs a git source tree to build.
  # IMPORTANT: Remember to check which git version cgit needs on every version
-  # bump (look in the Makefile).
-  # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
-  # 1.9.2 (see the repository history)
+  # bump (look for "GIT_VER" in the top-level Makefile).
  gitSrc = fetchurl {
-    url    = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
-    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
+    url    = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz";
+    sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
  };

  buildInputs = [
--- a/pkgs/applications/virtualization/qemu/2.8.nix
+++ b/pkgs/applications/virtualization/qemu/2.8.nix
@ -0,0 +1,93 @@
+{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
+, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
+, bison, lzo, snappy, libaio, gnutls, nettle, curl
+, makeWrapper
+, attr, libcap, libcap_ng
+, CoreServices, Cocoa, rez, setfile
+, numaSupport ? stdenv.isLinux, numactl
+, seccompSupport ? stdenv.isLinux, libseccomp
+, pulseSupport ? !stdenv.isDarwin, libpulseaudio
+, sdlSupport ? !stdenv.isDarwin, SDL
+, vncSupport ? true, libjpeg, libpng
+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
+, x86Only ? false
+, nixosTestRunner ? false
+}:
+
+with stdenv.lib;
+let
+  version = "2.8.0";
+  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+    + optionalString pulseSupport "pa,"
+    + optionalString sdlSupport "sdl,";
+in
+
+stdenv.mkDerivation rec {
+  name = "qemu-"  
+    + stdenv.lib.optionalString x86Only "x86-only-"
+    + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+    + version;
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
+    sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
+  };
+
+  buildInputs =
+    [ python2 zlib pkgconfig glib ncurses perl pixman
+      vde2 texinfo libuuid flex bison makeWrapper lzo snappy
+      gnutls nettle curl
+    ]
+    ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
+    ++ optionals seccompSupport [ libseccomp ]
+    ++ optionals numaSupport [ numactl ]
+    ++ optionals pulseSupport [ libpulseaudio ]
+    ++ optionals sdlSupport [ SDL ]
+    ++ optionals vncSupport [ libjpeg libpng ]
+    ++ optionals spiceSupport [ spice_protocol spice usbredir ]
+    ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./no-etc-install.patch
+  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+  hardeningDisable = [ "stackprotector" ];
+
+  configureFlags =
+    [ "--smbd=smbd" # use `smbd' from $PATH
+      "--audio-drv-list=${audio}"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+    ]
+    ++ optional numaSupport "--enable-numa"
+    ++ optional seccompSupport "--enable-seccomp"
+    ++ optional spiceSupport "--enable-spice"
+    ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
+    ++ optional stdenv.isDarwin "--enable-cocoa"
+    ++ optional stdenv.isLinux "--enable-linux-aio";
+
+  postFixup =
+    ''
+      for exe in $out/bin/qemu-system-* ; do
+        paxmark m $exe
+      done
+    '';
+
+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
+      fi
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.qemu.org/;
+    description = "A generic and open source machine emulator and virtualizer";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric eelco ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -137,6 +137,17 @@ stdenv.mkDerivation rec {

    # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
    ./CVE-2016-9102.patch
+
+    (fetchpatch {
+      name = "qemu-CVE-2016-9911.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714";
+      sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9921_9922.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
  hardeningDisable = [ "stackprotector" ];

--- a/pkgs/applications/window-managers/awesome/3.4.nix
+++ b/pkgs/applications/window-managers/awesome/3.4.nix
@ -1,55 +0,0 @@
-{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
-, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
-, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
-, libXdmcp, pixman, doxygen
-, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
-, docbook_xml_dtd_45, libxslt, coreutils, which }:
-
-let
-  version = "3.4.13";
-in
-
-stdenv.mkDerivation rec {
-  name = "awesome-${version}";
- 
-  src = fetchurl {
-    url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
-  };
- 
-  buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
-    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
-    asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ];
-
-  # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
-  # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
-  # dependencies.
-  prePatch = ''
-    # Fix the tab completion (supporting bash or zsh)
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
-    # Remove the 'root' PATH override (I don't know why they have that)
-    sed /WHOAMI/d -i utils/awsetbg
-    # Russian manpages fail to be generated:
-    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
-    #  asciidoc: ERROR: <stdin>: line 3: name section expected
-    #  asciidoc: FAILED: <stdin>: line 3: section title expected
-    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
-    substituteInPlace CMakeLists.txt \
-      --replace "set(AWE_MAN_LANGS it es fr de ru)" \
-                "set(AWE_MAN_LANGS it es fr de)"
-  '';
- 
-  meta = {
-    homepage = http://awesome.naquadah.org/;
-    description = "Highly configurable, dynamic window manager for X";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-
-  passthru = {
-    inherit lua;
-  };
-
-}
--- a/pkgs/applications/window-managers/awesome/3.5.nix
+++ b/pkgs/applications/window-managers/awesome/3.5.nix
@ -0,0 +1,86 @@
+{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
+, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
+, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
+, which, dbus, nettools, git, asciidoc, doxygen
+, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
+}:
+
+let
+  version = "3.5.9";
+in with luaPackages;
+
+stdenv.mkDerivation rec {
+  name = "awesome-${version}";
+
+  src = fetchurl {
+    url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
+    sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Highly configurable, dynamic window manager for X";
+    homepage    = http://awesome.naquadah.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.linux;
+  };
+
+  nativeBuildInputs = [
+    asciidoc
+    cmake
+    doxygen
+    imagemagick
+    makeWrapper
+    pkgconfig
+    xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
+  ];
+
+  buildInputs = [
+    cairo
+    dbus
+    gdk_pixbuf
+    gobjectIntrospection
+    git
+    lgi
+    libpthreadstubs
+    libstartup_notification
+    libxdg_basedir
+    lua
+    nettools
+    pango
+    xcb-util-cursor
+    xorg.libXau
+    xorg.libXdmcp
+    xorg.libxcb
+    xorg.libxshmfence
+    xorg.xcbutil
+    xorg.xcbutilimage
+    xorg.xcbutilkeysyms
+    xorg.xcbutilrenderutil
+    xorg.xcbutilwm
+  ];
+
+  #cmakeFlags = "-DGENERATE_MANPAGES=ON";
+
+  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
+  GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
+  LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
+  LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
+
+  postInstall = ''
+    wrapProgram $out/bin/awesome \
+      --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
+      --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
+
+    wrapProgram $out/bin/awesome-client \
+      --prefix PATH : "${which}/bin"
+  '';
+
+  passthru = {
+    inherit lua;
+  };
+}
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@ -4,25 +4,26 @@
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
 , which, dbus, nettools, git, asciidoc, doxygen
 , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
+, libxkbcommon, xcbutilxrm
 }:

 let
-  version = "3.5.9";
+  version = "4.0";
 in with luaPackages;

 stdenv.mkDerivation rec {
  name = "awesome-${version}";

  src = fetchurl {
-    url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
+    url    = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
+    sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
  };

  meta = with stdenv.lib; {
    description = "Highly configurable, dynamic window manager for X";
-    homepage    = http://awesome.naquadah.org/;
+    homepage    = https://awesomewm.org/;
    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 rasendubi ];
    platforms   = platforms.linux;
  };

@ -59,6 +60,8 @@ stdenv.mkDerivation rec {
    xorg.xcbutilkeysyms
    xorg.xcbutilrenderutil
    xorg.xcbutilwm
+    libxkbcommon
+    xcbutilxrm
  ];

  #cmakeFlags = "-DGENERATE_MANPAGES=ON";
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, bash, which, withFont ? "" }:

 stdenv.mkDerivation rec {
-  version = "0.8.0";
+  version = "1.0.0";
  name = "nerdfonts-${version}";
  src = fetchFromGitHub {
    owner = "ryanoasis";
    repo = "nerd-fonts";
    rev = version;
-    sha256 = "0n7idfk4460j8g0rw73hzz195pdh4c916hpc5r6dxpvgcmvryzc5";
+    sha256 = "1kz4hhshi3lsaja20kg258jc220q1b6nhwiyv0w433m0kvsgzdqd";
  };
  dontPatchShebangs = true;
  buildInputs = [ which ];
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@ -2,16 +2,16 @@

 stdenv.mkDerivation rec {
  name = "tzdata-${version}";
-  version = "2016f";
+  version = "2016j";

  srcs =
    [ (fetchurl {
        url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d";
+        sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
      })
      (fetchurl {
        url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj";
+        sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
      })
    ];

--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@ -3,323 +3,323 @@

 {
  bluedevil = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz";
-      sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq";
-      name = "bluedevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
+      sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
+      name = "bluedevil-5.8.5.tar.xz";
    };
  };
  breeze = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz";
-      sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw";
-      name = "breeze-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
+      sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
+      name = "breeze-5.8.5.tar.xz";
    };
  };
  breeze-grub = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz";
-      sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm";
-      name = "breeze-grub-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
+      sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
+      name = "breeze-grub-5.8.5.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz";
-      sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a";
-      name = "breeze-gtk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
+      sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
+      name = "breeze-gtk-5.8.5.tar.xz";
    };
  };
  breeze-plymouth = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz";
-      sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj";
-      name = "breeze-plymouth-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
+      sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
+      name = "breeze-plymouth-5.8.5.tar.xz";
    };
  };
  discover = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz";
-      sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx";
-      name = "discover-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
+      sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
+      name = "discover-5.8.5.tar.xz";
    };
  };
  kactivitymanagerd = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz";
-      sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2";
-      name = "kactivitymanagerd-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
+      sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
+      name = "kactivitymanagerd-5.8.5.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz";
-      sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14";
-      name = "kde-cli-tools-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
+      sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
+      name = "kde-cli-tools-5.8.5.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz";
-      sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4";
-      name = "kdecoration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
+      sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
+      name = "kdecoration-5.8.5.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz";
-      sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4";
-      name = "kde-gtk-config-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
+      sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
+      name = "kde-gtk-config-5.8.5.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz";
-      sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4";
-      name = "kdeplasma-addons-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
+      sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
+      name = "kdeplasma-addons-5.8.5.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz";
-      sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1";
-      name = "kgamma5-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
+      sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
+      name = "kgamma5-5.8.5.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz";
-      sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3";
-      name = "khotkeys-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
+      sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
+      name = "khotkeys-5.8.5.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz";
-      sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd";
-      name = "kinfocenter-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
+      sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
+      name = "kinfocenter-5.8.5.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz";
-      sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h";
-      name = "kmenuedit-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
+      sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
+      name = "kmenuedit-5.8.5.tar.xz";
    };
  };
  kscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz";
-      sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl";
-      name = "kscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
+      sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
+      name = "kscreen-5.8.5.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz";
-      sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv";
-      name = "kscreenlocker-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
+      sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
+      name = "kscreenlocker-5.8.5.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz";
-      sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc";
-      name = "ksshaskpass-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
+      sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
+      name = "ksshaskpass-5.8.5.tar.xz";
    };
  };
  ksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz";
-      sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3";
-      name = "ksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
+      sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
+      name = "ksysguard-5.8.5.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz";
-      sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn";
-      name = "kwallet-pam-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
+      sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
+      name = "kwallet-pam-5.8.5.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz";
-      sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7";
-      name = "kwayland-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
+      sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
+      name = "kwayland-integration-5.8.5.tar.xz";
    };
  };
  kwin = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz";
-      sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn";
-      name = "kwin-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
+      sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
+      name = "kwin-5.8.5.tar.xz";
    };
  };
  kwrited = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz";
-      sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s";
-      name = "kwrited-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
+      sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
+      name = "kwrited-5.8.5.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz";
-      sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p";
-      name = "libkscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
+      sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
+      name = "libkscreen-5.8.5.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz";
-      sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq";
-      name = "libksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
+      sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
+      name = "libksysguard-5.8.5.tar.xz";
    };
  };
  milou = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz";
-      sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8";
-      name = "milou-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
+      sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
+      name = "milou-5.8.5.tar.xz";
    };
  };
  oxygen = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz";
-      sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4";
-      name = "oxygen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
+      sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
+      name = "oxygen-5.8.5.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz";
-      sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q";
-      name = "plasma-desktop-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
+      sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
+      name = "plasma-desktop-5.8.5.tar.xz";
    };
  };
  plasma-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz";
-      sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn";
-      name = "plasma-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
+      sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
+      name = "plasma-integration-5.8.5.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz";
-      sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq";
-      name = "plasma-nm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
+      sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
+      name = "plasma-nm-5.8.5.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz";
-      sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i";
-      name = "plasma-pa-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
+      sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
+      name = "plasma-pa-5.8.5.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz";
-      sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9";
-      name = "plasma-sdk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
+      sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
+      name = "plasma-sdk-5.8.5.tar.xz";
    };
  };
  plasma-tests = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz";
-      sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k";
-      name = "plasma-tests-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
+      sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
+      name = "plasma-tests-5.8.5.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz";
-      sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd";
-      name = "plasma-workspace-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
+      sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
+      name = "plasma-workspace-5.8.5.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz";
-      sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3";
-      name = "plasma-workspace-wallpapers-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
+      sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
+      name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.8.4";
+    version = "1-5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz";
-      sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg";
-      name = "polkit-kde-agent-1-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
+      sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
+      name = "polkit-kde-agent-1-5.8.5.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz";
-      sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy";
-      name = "powerdevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
+      sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
+      name = "powerdevil-5.8.5.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz";
-      sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx";
-      name = "sddm-kcm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
+      sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
+      name = "sddm-kcm-5.8.5.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz";
-      sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv";
-      name = "systemsettings-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
+      sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
+      name = "systemsettings-5.8.5.tar.xz";
    };
  };
  user-manager = {
-    version = "5.8.4";
+    version = "5.8.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz";
-      sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d";
-      name = "user-manager-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
+      sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
+      name = "user-manager-5.8.5.tar.xz";
    };
  };
 }
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
  '';

  buildPhase = ''
+    # patch the script which launches the prebuilt compiler
+    substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \
+      "/usr/bin/env bash" "${stdenv.shell}"
+    substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \
+      "/usr/bin/env bash" "${stdenv.shell}"
+
    ${fixPrebuiltBinary}

    cd crystal-${version}
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, sphinx
 }:

 let
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
  ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx];

  enableParallelBuilding = true;

--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, sphinx
 }:

 let
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx ];

  enableParallelBuilding = true;

--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -998,7 +998,7 @@ self: super: {

  # The most current version needs some packages to build that are not in LTS 7.x.
  stack = super.stack.overrideScope (self: super: {
-    http-client = self.http-client_0_5_4;
+    http-client = self.http-client_0_5_5;
    http-client-tls = self.http-client-tls_0_3_3;
    http-conduit = self.http-conduit_2_2_3;
    optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
@ -1136,4 +1136,6 @@ self: super: {
  # requires vty 5.13
  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });

+  # https://github.com/krisajenkins/elm-export/pull/22
+  elm-export = doJailbreak super.elm-export;
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@ -19,6 +19,7 @@ self: super: {
  directory = null;
  filepath = null;
  ghc-prim = null;
+  ghci = null;
  haskeline = null;
  hoopl = null;
  hpc = null;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -2068,10 +2068,13 @@ package-maintainers:
    - ghc-srcspan-plugin
    - located-base
  jb55:
-    - skeletons
+    - bson-lens
    - cased
+    - elm-export-persistent
    - pipes-csv
    - pipes-mongodb
+    - skeletons
+    - streaming-wai
  khumba:
    - hoppy-docs
    - hoppy-generator
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@ -113,6 +113,7 @@ let

        configureFlags = ["--enable-shared" "--enable-pthread"]
          ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+          ++ op (!docSupport) "--disable-install-doc"
          ++ ops stdenv.isDarwin [
            # on darwin, we have /usr/include/tk.h -- so the configure script detects
            # that tk is installed
@ -154,7 +155,7 @@ let
          license = stdenv.lib.licenses.ruby;
          homepage = http://www.ruby-lang.org/en/;
          description = "The Ruby language";
-          maintainers = [ stdenv.lib.maintainers.vrthra ];
+          maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
          platforms = stdenv.lib.platforms.all;
        };

@ -218,4 +219,12 @@ in {
      git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
    };
  };
+
+  ruby_2_4_0 = generic {
+    version = rubyVersion "2" "4" "0" "";
+    sha256 = {
+      src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
+      git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
+    };
+  };
 }
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@ -65,4 +65,9 @@ rec {
    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
  ];
+  "2.4.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@ -1,8 +1,8 @@
 { fetchFromGitHub }:

 fetchFromGitHub {
-  owner  = "skaes";
+  owner  = "manveru";
  repo   = "rvm-patchsets";
-  rev    = "951e47ca1022cd1e41de9177fa87438cfb72d127";
-  sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";
+  rev    = "46e04f230ce91a786f5e583389443efec0ecd594";
+  sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
 }
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@ -2,7 +2,10 @@

 callPackage ./generic.nix (args // {
  baseVersion = "1.10";
-  revision = "13";
-  sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";
+  revision = "14";
+  sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h";
  extraConfigureFlags = "--with-gnump";
+  postPatch = ''
+    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
+  '';
 })
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@ -2,8 +2,8 @@

 callPackage ./generic.nix (args // {
  baseVersion = "1.11";
-  revision = "32";
-  sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn";
+  revision = "34";
+  sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar";
  openssl = null;
  postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@ -1,22 +1,21 @@
-{ fetchurl, stdenv, unzip }:
+{ fetchurl, fetchFromGitHub, stdenv }:

 stdenv.mkDerivation rec {
  name = "crypto++-${version}";
  majorVersion = "5.6";
-  version = "${majorVersion}.4";
+  version = "${majorVersion}.5";

-  src = fetchurl {
-    url = "mirror://sourceforge/cryptopp/cryptopp564.zip";
-    sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy";
+  src = fetchFromGitHub {
+    owner = "weidai11";
+    repo = "cryptopp";
+    rev = "CRYPTOPP_5_6_5";
+    sha256 = "1yk7jyf4va9425cg05llskpls2jm7n3jwy2hj5jm74zkr4mwpvl7";
  };

  patches = with stdenv;
    lib.optional (system != "i686-cygwin") ./dll.patch
    ++ lib.optional isDarwin ./GNUmakefile-darwin.patch;

-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";

  configurePhase = let
    marchflags =
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@ -3,18 +3,17 @@

 let
  ver_maj = "2.36";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
  name = "gdk-pixbuf-${ver_maj}.${ver_min}";

  src = fetchurl {
    url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c";
+    sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";
  };

  outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "dev";

  setupHook = ./setup-hook.sh;

@ -27,14 +26,21 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];

+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
+
  # on darwin, tests don't link
  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
    substituteInPlace Makefile --replace "docs tests" "docs"
  '';

-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  postInstall =
+    # All except one utility seem to be only useful during building.
+    ''
+      moveToOutput "bin" "$dev"
+      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+    '';

  # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
  inherit (doCheck);
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
    ++ optional xineramaSupport libXinerama
    ++ optionals cupsSupport [ cups ];

-  configureFlags = if stdenv.isDarwin
-    then "--disable-glibtest --disable-introspection --disable-visibility"
-    else "--with-xinput=yes";
+  configureFlags = [
+    "--with-xinput=yes"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "--disable-glibtest"
+    "--disable-introspection"
+    "--disable-visibility"
+  ];

  postInstall = ''
    moveToOutput share/gtk-2.0/demo "$devdoc"
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }:
+{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:

 stdenv.mkDerivation rec {
  name = "libgig-svn-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc";
  };

-  buildInputs = [ autoconf automake libsndfile libtool pkgconfig ];
+  buildInputs = [ autoconf automake libsndfile libtool pkgconfig libuuid ];

  preConfigure = "make -f Makefile.cvs";

--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@ -3,16 +3,18 @@
 stdenv.mkDerivation rec {
  name = "libivykis-${version}";

-  version = "0.39";
+  version = "0.40";

  src = fetchurl {
    url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz";
+    sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";
  };

-  buildInputs = [ autoreconfHook pkgconfig file protobufc ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ file protobufc ];

  meta = with stdenv.lib; {
+    homepage = "http://libivykis.sourceforge.net/";
    description = ''
      A thin wrapper over various OS'es implementation of I/O readiness
      notification facilities
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@ -1,14 +1,15 @@
-{stdenv, fetchurl, m4}:
+{ stdenv, fetchurl, m4 }:

 stdenv.mkDerivation rec {
-  name = "libmilter-8.14.8";
-  
+  name = "libmilter-${version}";
+  version = "8.15.2";
+
  src = fetchurl {
-    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz";
-    sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2";
+    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
+    sha256 = "0fdl9ndmspqspdlmghzxlaqk56j3yajk52d7jxcg21b7sxglpy94";
  };

-  buildPhase = '' 
+  buildPhase = ''
    mkdir -p $out/lib
    cd libmilter
    cat > a.m4 <<EOF
@ -29,10 +30,12 @@ stdenv.mkDerivation rec {
  '';

  patches = [ ./install.patch ./sharedlib.patch];
-  
-  buildInputs = [m4];

-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  buildInputs = [ m4 ];
+
+  meta = with stdenv.lib; {
+    description = "Sendmail Milter mail filtering API library";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
  };
 }
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "libstrophe-${version}";
-  version = "0.8.8";
+  version = "0.9.1";

  src = fetchFromGitHub {
    owner = "strophe";
    repo = "libstrophe";
    rev = version;
-    sha256 = "1xzyqqf99r0jfd0g3v0zwc68sac6y25v1d4m365zpc14l02midis";
+    sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";
  };

  buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ];
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
      runs well on both Linux, Unix, and Windows based platforms.
    '';
    homepage = http://strophe.im/libstrophe/;
-    license = stdenv.lib.licenses.gpl3;
+    license = with stdenv.lib.licenses; [gpl3 mit];
    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    maintainers = with stdenv.lib.maintainers; [devhell flosse];
  };
 }
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@ -1,16 +1,22 @@
-{ stdenv, fetchurl, sphinxbase, pkgconfig }:
+{ stdenv
+, fetchurl
+, sphinxbase
+, pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
+}:

 stdenv.mkDerivation rec {
-  name = "pocketsphinx-0.8";
+  name = "pocketsphinx-5prealpha";

  src = fetchurl {
    url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47";
+    sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg";
  };

  propagatedBuildInputs = [ sphinxbase ];

-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig python27 swig2 ];

  meta = {
    description = "Voice recognition library written in C";
@ -19,3 +25,22 @@ stdenv.mkDerivation rec {
    platforms = stdenv.lib.platforms.linux;
  };
 }
+
+/* Example usage:
+
+
+1.
+
+$ cat << EOF > vocabulary.txt
+oh mighty computer /1e-40/
+hello world /1e-30/
+EOF
+
+2.
+
+$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null
+# after you say "hello world":
+hello world
+...
+
+*/
--- a/pkgs/development/libraries/qwt/6_qt4.nix
+++ b/pkgs/development/libraries/qwt/6_qt4.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+stdenv.mkDerivation rec {
+  name = "qwt-6.1.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+    sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
+  };
+
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
+
+  postPatch = ''
+    sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
+  '';
+
+  qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
+
+  meta = with stdenv.lib; {
+    description = "Qt widgets for technical applications";
+    homepage = http://qwt.sourceforge.net/;
+    # LGPL 2.1 plus a few exceptions (more liberal)
+    license = stdenv.lib.licenses.qwt;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+    branch = "6";
+  };
+}
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@ -2,18 +2,20 @@
 , fetchurl
 , bison
 , pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
 , multipleOutputs ? false #Uses incomplete features of nix!
 }:

 stdenv.mkDerivation (rec {
-  name = "sphinxbase-0.8";
+  name = "sphinxbase-5prealpha";

  src = fetchurl {
    url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";
+    sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";
  };

-  buildInputs = [ pkgconfig bison ];
+  buildInputs = [ swig2 python27 pkgconfig bison ];

  meta = {
    description = "Support Library for Pocketsphinx";
--- a/pkgs/development/python-modules/pygame/git.nix
+++ b/pkgs/development/python-modules/pygame/git.nix
@ -41,5 +41,6 @@ buildPythonPackage rec {
    homepage = "http://www.pygame.org/";
    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
+    broken = true;
  };
 }
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:

 stdenv.mkDerivation rec {
-  name = "libsigrokdecode-0.4.0";
+  name = "libsigrokdecode-0.4.1";

  src = fetchurl {
    url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
-    sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx";
+    sha256 = "15aabl9p4586v2bkj4bm4xi7l3309r9zb31sw233s5vi170p0pq6";
  };

  buildInputs = [ pkgconfig glib python3 libsigrok check ];
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@ -53,6 +53,6 @@ stdenv.mkDerivation rec {

    maintainers = with stdenv.lib.maintainers; [viric];

-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@ -1,7 +1,9 @@
 { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk2
-, server ? true, readline }:
+, server ? true, readline
+, enableSqlite ? true, sqlite
+}:

 let
  inherit (stdenv.lib) optional optionals;
@ -10,14 +12,15 @@ let
  gtkName = if gtkClient then "-gtk" else "";

  name = "freeciv";
-  version = "2.5.3";
+  version = "2.5.6";
 in
 stdenv.mkDerivation {
  name = "${name}${sdlName}${gtkName}-${version}";
+  inherit version;

  src = fetchurl {
    url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
-    sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8";
+    sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg";
  };

  nativeBuildInputs = [ pkgconfig ];
@ -25,10 +28,12 @@ stdenv.mkDerivation {
  buildInputs = [ zlib bzip2 curl lzma gettext ]
    ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
    ++ optionals gtkClient [ gtk2 ]
-    ++ optional server readline;
+    ++ optional server readline
+    ++ optional enableSqlite sqlite;

-  configureFlags = []
+  configureFlags = [ "--enable-shared" ]
    ++ optional sdlClient "--enable-client=sdl"
+    ++ optional enableSqlite "--enable-fcdb=sqlite3"
    ++ optional (!gtkClient) "--enable-fcmp=cli"
    ++ optional (!server) "--disable-server";

--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:

 let
  libnbt = fetchFromGitHub {
@ -16,7 +16,7 @@ stdenv.mkDerivation {
    rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
    sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
  };
-  buildInputs = [ cmake qt5Full jdk7 zlib file makeWrapper ];
+  buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ];

  libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
  postUnpack = ''
@ -42,7 +42,7 @@ stdenv.mkDerivation {
    cp -v MultiMC $out/bin/
    cp -v jars/*.jar $out/bin/jars/ #*/
    cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
-    wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/
+    wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
  '';

  meta = with stdenv.lib; {
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@ -11,14 +11,14 @@ let
    };
  });
 in stdenv.mkDerivation rec {
-  version = "0.40.0";
+  version = "0.41.0";
  name = "openmw-${version}";

  src = fetchFromGitHub {
    owner = "OpenMW";
    repo = "openmw";
    rev = name;
-    sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w";
+    sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz";
  };

  enableParallelBuilding = true;
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@ -44,7 +44,7 @@ let
    libav
    atk
    # Only libraries are needed from those two
-    udev182
+    libudev0-shim
    networkmanager098

    # Verified games requirements
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@ -5,11 +5,11 @@
 assert enablePython -> python2 != null;

 stdenv.mkDerivation rec {
-  name = "cryptsetup-1.7.0";
+  name = "cryptsetup-1.7.3";

  src = fetchurl {
    url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
-    sha256 = "0j6iwf64pdrl4nm5ypc2r33b3k0aflb939wz2496vcqdrjkj8m87";
+    sha256 = "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg";
  };

  configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@ -1,13 +1,10 @@
 { stdenv, fetchFromGitHub, utillinux
-  ,autoconf, automake, libtool, gettext }:
+, autoconf, automake, libtool, gettext }:

 stdenv.mkDerivation rec {
  name = "fuse-${version}";
-
  version = "2.9.7";

-  #builder = ./builder.sh;
-
  src = fetchFromGitHub {
    owner = "libfuse";
    repo = "libfuse";
@ -17,8 +14,6 @@ stdenv.mkDerivation rec {

  buildInputs = [ utillinux autoconf automake libtool gettext ];

-  inherit utillinux;
-
  preConfigure =
    ''
      export MOUNT_FUSE_PATH=$out/sbin
@ -32,7 +27,7 @@ stdenv.mkDerivation rec {

      sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
      sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
-      
+
      ./makeconf.sh
    '';

--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  name = "iproute2-${version}";
-  version = "4.7.0";
+  version = "4.9.0";

  src = fetchurl {
    url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "14kvpdlxq8204f5ayfdfb6mc0423mbf3px9q0spdly9sng7xnq4g";
+    sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
  };

  patches = lib.optionals enableFan [
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "4.9-rc8";
-  modDirVersion = "4.9.0-rc8";
-  extraMeta.branch = "4.9";
+  version = "4.10-rc1";
+  modDirVersion = "4.10.0-rc1";
+  extraMeta.branch = "4.10";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7";
+    sha256 = "1s7axcii6jzm77ivmy26llf4z6dprfp3sb1v35fchl9bkzaivaly";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@ -165,4 +165,14 @@ rec {
        sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";
      };
    };
+
+  panic_on_icmp6_frag_CVE_2016_9919 = rec
+    { name = "panic_on_icmp6_frag_CVE_2016_9919.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2";
+        sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
+      };
+    };
+
 }
--- a/pkgs/os-specific/linux/kexectools/arm.patch
+++ b/pkgs/os-specific/linux/kexectools/arm.patch
@ -1,28 +0,0 @@
-Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h,
-include them here for a temporary fix
-
-diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h
--- kexec-tools/kexec/arch/arm/iomem.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/iomem.h	2016-08-09 15:38:26.938594379 +0800
-@@ -0,0 +1,9 @@
-+#ifndef IOMEM_H
-+#define IOMEM_H
-+
-+#define SYSTEM_RAM		"System RAM\n"
-+#define SYSTEM_RAM_BOOT		"System RAM (boot alias)\n"
-+#define CRASH_KERNEL		"Crash kernel\n"
-+#define CRASH_KERNEL_BOOT	"Crash kernel (boot alias)\n"
-+
-+#endif
-diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h
--- kexec-tools/kexec/arch/arm/phys_to_virt.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h	2016-08-09 14:50:30.104143361 +0800
-@@ -0,0 +1,8 @@
-+#ifndef PHYS_TO_VIRT_H
-+#define PHYS_TO_VIRT_H
-+
-+#include <stdint.h>
-+
-+extern uint64_t phys_offset;
-+
-+#endif
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@ -2,18 +2,16 @@

 stdenv.mkDerivation rec {
  name = "kexec-tools-${version}";
-  version = "2.0.13";
+  version = "2.0.14";

  src = fetchurl {
    urls = [
      "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
      "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
    ];
-    sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
+    sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
  };

-  patches = [ ./arm.patch ];
-
  hardeningDisable = [ "format" "pic" "relro" ];

  buildInputs = [ zlib ];
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libudev0-shim-${version}";
+  version = "1";
+
+  src = fetchFromGitHub {
+    owner = "archlinux";
+    repo = "libudev0-shim";
+    rev = "v${version}";
+    sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";
+  };
+
+  buildInputs = [ udev ];
+
+  installPhase = ''
+    name="$(echo libudev.so.*)"
+    install -Dm755 "$name" "$out/lib/$name"
+    ln -s "$name" "$out/lib/libudev.so.0"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Shim to preserve libudev.so.0 compatibility";
+    homepage = "https://github.com/archlinux/libudev0-shim";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
--- a/pkgs/os-specific/linux/udev/145.nix
+++ b/pkgs/os-specific/linux/udev/145.nix
@ -1,53 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-145";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
-  };
-
-  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
-
-  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
-  preConfigure =
-    ''
-      substituteInPlace extras/keymap/Makefile.in \
-        --replace /usr/include ${stdenv.glibc.dev}/include
-    '';
-
-  postInstall =
-    ''
-      # Install some rules that really should be installed by default.
-      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
-        cp rules/packages/$i $out/libexec/rules.d/
-      done
-
-      # The path to rule_generator.functions in write_cd_rules and
-      # write_net_rules is broken.  Also, don't store the mutable
-      # persistant rules in /etc/udev/rules.d but in
-      # /var/lib/udev/rules.d.
-      for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
-        substituteInPlace $i \
-          --replace /lib/udev $out/libexec \
-          --replace /etc/udev/rules.d /var/lib/udev/rules.d
-      done
-
-      # Don't set PATH to /bin:/sbin; won't work in NixOS.
-      substituteInPlace $out/libexec/rule_generator.functions \
-        --replace 'PATH=' '#PATH='
-
-      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
-      # environment of the caller.
-      sed '3,4d' -i $out/libexec/firmware.sh
-    '';
-
-  meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-  };
-}
--- a/pkgs/os-specific/linux/udev/182.nix
+++ b/pkgs/os-specific/linux/udev/182.nix
@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-, pciutils, utillinux, kmod, usbutils, gperf
-}:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-182";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection
-                  gperf
-                ];
-
-  configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids"
-                     "--disable-gudev"
-                     "--disable-introspection"
-                   ];
-
-  postPatch = ''
-    sed -i 's:input.h:input-event-codes.h:' Makefile.in
-    sed -i '20a#include <stdint.h>' src/mtd_probe/mtd_probe.h
-  '';
-
-  NIX_LDFLAGS = [ "-lrt" ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
-}
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@ -1,20 +1,25 @@
-{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }:
-
+{ stdenv, pkgs, fetchurl, fetchgit,
+  jansson, libxml2, libxslt, ncurses, openssl, sqlite,
+  utillinux, dmidecode, libuuid, binutils, newt,
+  lua,
+  srtp, wget, curl,
+  subversionClient
+}:
 stdenv.mkDerivation rec {
  name = "asterisk-${version}";
-  version = "13.6.0";
+  version = "14.1.2";

  src = fetchurl {
    url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
-    sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca";
+    sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";
  };

  # Note that these sounds are included with the release tarball. They are
  # provided here verbatim for the convenience of anyone wanting to build
  # Asterisk from other sources.
  coreSounds = fetchurl {
-    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz;
-    sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73";
+    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+    sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
  };
  mohSounds = fetchurl {
    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
@ -22,7 +27,7 @@ stdenv.mkDerivation rec {
  };
  # TODO: Sounds for other languages could be added here

-  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ];
+  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];

  patches = [
    # Disable downloading of sound files (we will fetch them
@ -38,14 +43,24 @@ stdenv.mkDerivation rec {

  # Use the following preConfigure section when building Asterisk from sources
  # other than the release tarball.
-#   preConfigure = ''
-#     ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz
-#     ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
-#   '';
+  # preConfigure = ''
+  #   ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz
+  #   ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
+  #'';

  # The default libdir is $PREFIX/usr/lib, which causes problems when paths
  # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.
-  configureFlags = "--libdir=\${out}/lib";
+  configureFlags = [
+    "--libdir=\${out}/lib"
+    "--with-lua=${lua}/lib"
+    "--with-pjproject-bundled"
+  ];
+
+  preBuild = ''
+    make menuselect.makeopts
+    substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
+    ./contrib/scripts/get_mp3_source.sh
+  '';

  postInstall = ''
    # Install sample configuration files for this version of Asterisk
@ -56,9 +71,6 @@ stdenv.mkDerivation rec {
    description = "Software implementation of a telephone private branch exchange (PBX)";
    homepage = http://www.asterisk.org/;
    license = licenses.gpl2;
-    maintainers = with maintainers; [ auntie ];
-    # Marked as broken due to needing an update for security issues.
-    # See: https://github.com/NixOS/nixpkgs/issues/18856
-    broken = true;
+    maintainers = with maintainers; [ auntie DerTim1 ];
  };
 }
--- a/pkgs/servers/asterisk/disable-download.patch
+++ b/pkgs/servers/asterisk/disable-download.patch
@ -1,7 +1,7 @@
-diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile
--- asterisk-13.2.0/sounds/Makefile	2014-09-09 14:01:11.000000000 -0600
-+++ asterisk-13.2.0-patched/sounds/Makefile	2015-03-31 16:12:00.549133670 -0600
-@@ -89,7 +89,7 @@
+diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile 
+--- asterisk-14.1.2/sounds/Makefile	2016-11-10 20:43:02.000000000 +0100
+++ asterisk-14.1.2-patched/sounds/Makefile	2016-11-16 10:08:46.591615147 +0100
+@@ -90,7 +90,7 @@
 	  ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \
 	fi
 
--- a/pkgs/servers/asterisk/runtime-vardirs.patch
+++ b/pkgs/servers/asterisk/runtime-vardirs.patch
@ -1,6 +1,6 @@
-diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h
--- asterisk-13.3.2/build_tools/make_defaults_h	2012-01-30 14:21:16.000000000 -0700
-+++ asterisk-13.3.2-patched/build_tools/make_defaults_h	2015-04-15 19:07:46.760351155 -0600
+diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h
+--- asterisk-14.1.2/build_tools/make_defaults_h	2016-11-10 20:43:02.000000000 +0100
+++ asterisk-14.1.2-patched/build_tools/make_defaults_h	2016-11-16 10:09:04.189625495 +0100
@@ -1,4 +1,13 @@
 #!/bin/sh
 +
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@ -1,4 +1,5 @@
-{ stdenv, fetchurl, home ? "/var/lib/crowd" }:
+{ stdenv, fetchurl, home ? "/var/lib/crowd"
+, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:

 stdenv.mkDerivation rec {
  name = "atlassian-crowd-${version}";
@ -18,9 +19,22 @@ stdenv.mkDerivation rec {
    rm -rf apache-tomcat/work
    ln -s /run/atlassian-crowd/work apache-tomcat/work

+    ln -s /run/atlassian-crowd/database database
+
    substituteInPlace apache-tomcat/bin/startup.sh --replace start run

    echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties
+    substituteInPlace build.properties \
+      --replace "openidserver.url=http://localhost:8095/openidserver" \
+                "openidserver.url=http://localhost:${toString port}/openidserver"
+    substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      --replace "http://localhost:8095/" \
+                "http://localhost:${toString port}/"
+    sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      -e 's,application.password\s+password,application.password ${openidPassword},'
+  '' + stdenv.lib.optionalString (proxyUrl != null) ''
+    sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,'
  '';

  installPhase = ''
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;

 stdenv.mkDerivation rec {
-  version = "2.4.23";
+  version = "2.4.25";
  name = "apache-httpd-${version}";

  src = fetchurl {
    url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc";
+    sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq";
  };

  # FIXME: -dev depends on -doc
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;

 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.41";
+  name = "lighttpd-1.4.44";

  src = fetchurl {
    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b";
+    sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd";
  };

  buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@ -27,7 +27,6 @@ stdenv.mkDerivation {
    "--with-http_realip_module"
    "--with-http_addition_module"
    "--with-http_xslt_module"
-    "--with-http_image_filter_module"
    "--with-http_geoip_module"
    "--with-http_sub_module"
    "--with-http_dav_module"
@ -44,6 +43,7 @@ stdenv.mkDerivation {
    # Install destination problems
    # "--with-http_perl_module"
  ] ++ optional withStream "--with-stream"
+    ++ optional (gd != null) "--with-http_image_filter_module"
    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
    ++ map (mod: "--add-module=${mod.src}") modules;

--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream
 index a0659ab..dba3729 100644
 --- a/src/lib-ssl-iostream/iostream-ssl.c
 +++ b/src/lib-ssl-iostream/iostream-ssl.c
-@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
- 	memset(&mod_set, 0, sizeof(mod_set));
+@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
 	mod_set.abi_version = DOVECOT_ABI_VERSION;
 	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
+ 	mod_set.require_init_funcs = TRUE;
 -	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
 +	ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
- 
- 	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
- 	if (ssl_vfuncs == NULL) {
+ 	if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
+ 					&mod_set, error_r) < 0)
+ 		return -1;
 diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
 index e2233bf..bbf981e 100644
 --- a/src/lib-storage/mail-storage-settings.c
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@ -8,7 +8,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.25";
+  name = "dovecot-2.2.27";

  nativeBuildInputs = [ perl pkgconfig ];
  buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq";
+    sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
  };

  preConfigure = ''
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@ -0,0 +1,26 @@
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "snmp_exporter-${version}";
+  version = "0.1.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/prometheus/snmp_exporter";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "prometheus";
+    repo = "snmp_exporter";
+    sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "SNMP Exporter for Prometheus";
+    homepage = https://github.com/prometheus/snmp_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ oida ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:

 stdenv.mkDerivation rec {
-  version = "2.19";
+  version = "2.20";
  name = "shellinabox-${version}";

  src = fetchFromGitHub {
    owner = "shellinabox";
    repo = "shellinabox";
-    rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd";
-    sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan";
+    rev = "v${version}";
+    sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr";
  };

  patches = [ ./shellinabox-minus.patch ];
--- a/pkgs/servers/sql/postgresql/pg_similarity/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_similarity/default.nix
@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, gcc, postgresql }:
+
+stdenv.mkDerivation {
+
+  name = "pg_similarity-1.0";
+  src = fetchFromGitHub {
+    owner = "eulerto";
+    repo = "pg_similarity";
+    rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5";
+    sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim";
+  };
+
+  buildInputs = [ postgresql gcc ];
+  buildPhase = "USE_PGXS=1 make";
+  installPhase = ''
+    mkdir -p $out/bin   # for buildEnv to setup proper symlinks
+    install -D pg_similarity.so -t $out/lib/
+    install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension
+  '';
+
+  meta = {
+    description = ''
+       pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation
+       is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional
+       operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).
+    '';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ danbst ];
+  };
+}
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication {
    homepage = "http://www.nongnu.org/duplicity";
    license = stdenv.lib.licenses.gpl2Plus;
    maintainers = with stdenv.lib.maintainers; [viric peti];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@ -35,6 +35,6 @@ stdenv.mkDerivation {
    homepage = http://duply.net/;
    license = licenses.gpl2;
    maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@ -27,6 +27,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = "http://www.zlib.net/pigz/";
    description = "A parallel implementation of gzip for multi-core machines";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
    description = ''A parallel compressor/decompressor for xz format'';
    license = stdenv.lib.licenses.bsd2;
    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/tools/misc/hhpc/default.nix
+++ b/pkgs/tools/misc/hhpc/default.nix
@ -0,0 +1,28 @@
+{stdenv, fetchFromGitHub, xorg, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "hhpc-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "aktau";
+    repo = "hhpc";
+    rev = "v${version}";
+    sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ xorg.libX11 ];
+
+  installPhase = ''
+      mkdir -p $out/bin
+      cp hhpc $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Hides the mouse pointer in X11";
+    maintainers = with maintainers; [ nico202 ];
+    platforms = platforms.unix;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mlocate-${version}";
+  version = "0.26";
+
+  src = fetchurl {
+    url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz";
+    sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
+  };
+
+  buildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    description = "Merging locate is an utility to index and quickly search for files";
+    homepage = https://fedorahosted.org/mlocate/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
+  };
+}
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@ -32,5 +32,6 @@ stdenv.mkDerivation {
    '';
    maintainers = with maintainers; [ domenkozar ];
    platforms = platforms.unix;
+    license = stdenv.lib.licenses.publicDomain;
  };
 }
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl
+{ stdenv, fetchurl, libressl
 , privsepPath ? "/var/empty"
 , privsepUser ? "ntp"
 }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    "--localstatedir=/var"
  ];

-  buildInputs = [ openssl ];
+  buildInputs = [ libressl ];

  installFlags = [
    "sysconfdir=\${out}/etc"
--- a/pkgs/tools/networking/wakelan/default.nix
+++ b/pkgs/tools/networking/wakelan/default.nix
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2Plus;

    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:

 stdenv.mkDerivation rec {
-  version = "1.1.12";
+  version = "1.1.14";
  name = "zerotierone";

  src = fetchurl {
    url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0mji6bmxjvxy2mhvzfz4vpdz62n1wv6a02rapzbiad8zr2c869cm";
+    sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj";
  };

  preConfigure = ''
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    description = "Create flat virtual Ethernet networks of almost unlimited size";
    homepage = https://www.zerotier.com;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie zimbatm ];
    platforms = platforms.allBut [ "i686-linux" ];
  };
 }
--- a/Show More
+++ b/Show More