From f40b96137844fe474f9c7d73272313a3848b4ee5 Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Fri, 10 Feb 2017 12:50:28 +0100
Subject: [PATCH 001/110] couchdb: add support for version 2.0.0

Version 2.0.0 is installed as a separate package called "couchdb2".
When setting the config option "package" attribute to pkgs.couchdb2, a
corresponding service configuration will be generated.  If a previous
1.6 installation exists, the databases can still be found on the local
port (default: 5986) and can be replicated from there.

Note that single-node or cluster setup still needs to be configured
manually, as described in
http://docs.couchdb.org/en/2.0.0/install/index.html.
---
 nixos/modules/services/databases/couchdb.nix | 30 ++++++++--
 pkgs/servers/http/couchdb/2.0.0.nix          | 53 +++++++++++++++++
 pkgs/servers/http/couchdb/jsapi.patch        | 60 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++
 4 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/servers/http/couchdb/2.0.0.nix
 create mode 100644 pkgs/servers/http/couchdb/jsapi.patch

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index d4d231456c5..52247bfb983 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -4,20 +4,29 @@ with lib;
 
 let
   cfg = config.services.couchdb;
-  configFile = pkgs.writeText "couchdb.ini"
+  useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0";
+  configFile = pkgs.writeText "couchdb.ini" (
     ''
       [couchdb]
       database_dir = ${cfg.databaseDir}
       uri_file = ${cfg.uriFile}
       view_index_dir = ${cfg.viewIndexDir}
-
+    '' + (if useVersion2 then
+    ''
+      [chttpd]
+    '' else
+    ''
       [httpd]
+    '') +
+    ''
       port = ${toString cfg.port}
       bind_address = ${cfg.bindAddress}
 
       [log]
       file = ${cfg.logFile}
-    '';
+    '');
+  executable = if useVersion2 then "${cfg.package}/bin/couchdb"
+    else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}'';
 
 in {
 
@@ -130,7 +139,6 @@ in {
 
       configFile = mkOption {
         type = types.string;
-        default = "/var/lib/couchdb/couchdb.ini";
         description = ''
           Configuration file for persisting runtime changes. File
           needs to be readable and writable from couchdb user/group.
@@ -147,6 +155,9 @@ in {
 
     environment.systemPackages = [ cfg.package ];
 
+    services.couchdb.configFile = mkDefault
+      (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini");
+
     systemd.services.couchdb = {
       description = "CouchDB Server";
       wantedBy = [ "multi-user.target" ];
@@ -170,11 +181,20 @@ in {
         fi
         '';
 
+      environment = mkIf useVersion2 {
+        # we are actually specifying 4 configuration files:
+        # 1. the preinstalled default.ini
+        # 2. the module configuration
+        # 3. the extraConfig from the module options
+        # 4. the locally writable config file, which couchdb itself writes to
+        ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
+      };
+
       serviceConfig = {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}";
+        ExecStart = executable;
       };
     };
 
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
new file mode 100644
index 00000000000..0481ebb9b8d
--- /dev/null
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
+, coreutils, bash, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "couchdb-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc";
+  };
+
+  buildInputs = [ erlang icu openssl spidermonkey makeWrapper ];
+
+  patches = [ ./jsapi.patch ];
+  postPatch = ''
+    substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE"
+
+    patch bin/rebar <<EOF
+    1c1
+    < #!/usr/bin/env escript
+    ---
+    > #!${coreutils}/bin/env escript
+    EOF
+
+  '';
+
+  # Configure a username.  The build system would use "couchdb" as
+  # default if none is provided.  Note that it is unclear where this
+  # username is actually used in the build, as any choice seems to be
+  # working.
+  configurePhase = ''
+    ./configure -u nobody
+  '';
+
+  buildPhase = ''
+    make release
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r rel/couchdb/* $out
+    wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
+    homepage = "http://couchdb.apache.org";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/pkgs/servers/http/couchdb/jsapi.patch
new file mode 100644
index 00000000000..bb7d4ca610c
--- /dev/null
+++ b/pkgs/servers/http/couchdb/jsapi.patch
@@ -0,0 +1,60 @@
+diff -ru couch_js/http.c couch_js-patched/http.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c	2017-02-10 10:52:33.025854045 +0100
+@@ -15,7 +15,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ #include "utf8.h"
+ #include "util.h"
+diff -ru couch_js/main.c couch_js-patched/main.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c	2017-02-10 10:52:33.001854154 +0100
+@@ -20,7 +20,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ #include "http.h"
+ #include "utf8.h"
+diff -ru couch_js/utf8.c couch_js-patched/utf8.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c	2017-02-10 10:52:33.009854117 +0100
+@@ -10,7 +10,7 @@
+ // License for the specific language governing permissions and limitations under
+ // the License.
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ 
+ static int
+diff -ru couch_js/util.c couch_js-patched/util.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c	2017-02-10 10:52:33.017854081 +0100
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ 
+ #include "help.h"
+ #include "util.h"
+diff -ru couch_js/util.h couch_js-patched/util.h
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h	2017-02-10 10:52:32.988854212 +0100
+@@ -13,7 +13,7 @@
+ #ifndef COUCHJS_UTIL_H
+ #define COUCHJS_UTIL_H
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ 
+ typedef struct {
+     int          no_eval;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 079f3220015..36f98de5a51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10287,6 +10287,10 @@ with pkgs;
     erlang = erlangR16;
   };
 
+  couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
+    spidermonkey = spidermonkey_1_8_5;
+  };
+
   couchpotato = callPackage ../servers/couchpotato {};
 
   dico = callPackage ../servers/dico { };

From 2262855d9c50514d1aa33b1f443c7255c0d3d52e Mon Sep 17 00:00:00 2001
From: butterflya <rtdvrs+butterflya@gmail.com>
Date: Sat, 11 Mar 2017 15:03:48 +0100
Subject: [PATCH 002/110] Delete invalid option

The removed configureFlags entry is not a documented option according to `configure --help`.
---
 pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
index 87a014f8f74..c0ef7904668 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
+  configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";

From 06ece41778ff3c06dbb4fad0f87e888ca6c9889d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 12 Mar 2017 12:51:03 -0500
Subject: [PATCH 003/110] KDE Applications: 16.12.2 -> 16.12.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 2224 ++++++++++++++++----------------
 2 files changed, 1113 insertions(+), 1113 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 607a16eb45b..c31b8a86583 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 60c412e55fd..445c5783b8e 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2227 +3,2227 @@
 
 {
   akonadi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz";
-      sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z";
-      name = "akonadi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-16.12.3.tar.xz";
+      sha256 = "00sbchj3yjbqdjckrciv2c7j9i7kc5yqvyvbmjlxacbkq80a4j7w";
+      name = "akonadi-16.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz";
-      sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k";
-      name = "akonadi-calendar-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-16.12.3.tar.xz";
+      sha256 = "0kv636a8x75fcagw8hjnrwnxzvqnnm42hfw68ywfics0pn0pl50g";
+      name = "akonadi-calendar-16.12.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz";
-      sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj";
-      name = "akonadi-calendar-tools-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-tools-16.12.3.tar.xz";
+      sha256 = "157kmcl77pj32ysbwr1xw365p5pgk69w5j8397axly6dmdl71x47";
+      name = "akonadi-calendar-tools-16.12.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz";
-      sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb";
-      name = "akonadiconsole-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadiconsole-16.12.3.tar.xz";
+      sha256 = "195amn610y5ydg665ag45xb0l1wyplbdlrwagzc7yvswp12rlcv3";
+      name = "akonadiconsole-16.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz";
-      sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp";
-      name = "akonadi-contacts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-contacts-16.12.3.tar.xz";
+      sha256 = "1205g4z5rz02j8swrmhncm06d8m727z63d526djygz5svz15sd2l";
+      name = "akonadi-contacts-16.12.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz";
-      sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq";
-      name = "akonadi-import-wizard-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-import-wizard-16.12.3.tar.xz";
+      sha256 = "0dnpiqcmphm2x76f21acrwhg7ah5ih0hnhxdy1d6pm3ng2p1irfq";
+      name = "akonadi-import-wizard-16.12.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz";
-      sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s";
-      name = "akonadi-mime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-mime-16.12.3.tar.xz";
+      sha256 = "1xay3rlygdhf9lp356wjb92wnmxdpaxgm3prxnfxcdg5ql6xcg07";
+      name = "akonadi-mime-16.12.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz";
-      sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl";
-      name = "akonadi-notes-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-notes-16.12.3.tar.xz";
+      sha256 = "0405nkz9ri9qlclgvwycvdx1gsms2pm1fn6xhvyrj2v4s8brb3r7";
+      name = "akonadi-notes-16.12.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz";
-      sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5";
-      name = "akonadi-search-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-search-16.12.3.tar.xz";
+      sha256 = "0wf22rmfz471iw6zxl7yz279fkks2pj5jfw4bs5185kr3xw2q7zp";
+      name = "akonadi-search-16.12.3.tar.xz";
     };
   };
   akregator = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz";
-      sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il";
-      name = "akregator-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akregator-16.12.3.tar.xz";
+      sha256 = "1v6jg35ha6wrjgwfvrvy1qwl1700dmk40d0fwy1irkpdlgg79128";
+      name = "akregator-16.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz";
-      sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy";
-      name = "analitza-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/analitza-16.12.3.tar.xz";
+      sha256 = "0ap3sf8bw9f58pzw3zy6w60apd4ccc47zs3v61x4kp1g81rn265w";
+      name = "analitza-16.12.3.tar.xz";
     };
   };
   ark = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz";
-      sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3";
-      name = "ark-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ark-16.12.3.tar.xz";
+      sha256 = "0q1bxrsb03pwsvxqlbnzfmahlj300l336pdrm82vin89m294ird0";
+      name = "ark-16.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz";
-      sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5";
-      name = "artikulate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/artikulate-16.12.3.tar.xz";
+      sha256 = "113k6c0yrir61j258gn9n6k7fifa6g9g8wxf3zq18jy3liwdl97s";
+      name = "artikulate-16.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz";
-      sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga";
-      name = "audiocd-kio-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/audiocd-kio-16.12.3.tar.xz";
+      sha256 = "0bmmi2rxx368nss8ciwj32dspc1ailc0shm06ynmhw3slrplnx1y";
+      name = "audiocd-kio-16.12.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz";
-      sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x";
-      name = "baloo-widgets-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/baloo-widgets-16.12.3.tar.xz";
+      sha256 = "0h75zhdiylyjifdk9ikw9gpwla3p87knndc2svkci90ga7ynggvl";
+      name = "baloo-widgets-16.12.3.tar.xz";
     };
   };
   blinken = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz";
-      sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x";
-      name = "blinken-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/blinken-16.12.3.tar.xz";
+      sha256 = "1z50ack1iqh194vn487nhdkrbn1camswy4a3g2ayxv3qfgmxdcga";
+      name = "blinken-16.12.3.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz";
-      sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09";
-      name = "blogilo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/blogilo-16.12.3.tar.xz";
+      sha256 = "14yl52m8x7b8bj2b7pkhabwg7rrmmhnkjq4z7mrxbnsndqmsi10f";
+      name = "blogilo-16.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz";
-      sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc";
-      name = "bomber-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/bomber-16.12.3.tar.xz";
+      sha256 = "1h4s6amjzazr3ywcqw8d14a0fi1arzxka0g6i9ii85s904k23r41";
+      name = "bomber-16.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz";
-      sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq";
-      name = "bovo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/bovo-16.12.3.tar.xz";
+      sha256 = "1pr67gf47xmw21sv1im7k0dz18bhjfpbkhd7j5gaifj66h65sfy6";
+      name = "bovo-16.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz";
-      sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb";
-      name = "calendarsupport-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/calendarsupport-16.12.3.tar.xz";
+      sha256 = "0r30z2wzyms7m7s8y0livsfy5pj82g988bs6amaj2571hz55d8y0";
+      name = "calendarsupport-16.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz";
-      sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4";
-      name = "cantor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/cantor-16.12.3.tar.xz";
+      sha256 = "1nzg9sfnv8afpa84x51whbw1qh8gfwqnkr5zyai7817kkc97g1l8";
+      name = "cantor-16.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz";
-      sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx";
-      name = "cervisia-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/cervisia-16.12.3.tar.xz";
+      sha256 = "14r55ngvz4rci1h3iqdwbfcyxmm2b04c5smkv9x0bqxq4zz2yfvk";
+      name = "cervisia-16.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz";
-      sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6";
-      name = "dolphin-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/dolphin-16.12.3.tar.xz";
+      sha256 = "0y35ljbjib4pvyngdgbq1yx3rfmy94crpa7v1zzwfav94lm3kwb2";
+      name = "dolphin-16.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz";
-      sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3";
-      name = "dolphin-plugins-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/dolphin-plugins-16.12.3.tar.xz";
+      sha256 = "18azlmzw33praz4z6lamamj79gyxbbdgz7lp1cimxyddhmacc2x9";
+      name = "dolphin-plugins-16.12.3.tar.xz";
     };
   };
   dragon = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz";
-      sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk";
-      name = "dragon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/dragon-16.12.3.tar.xz";
+      sha256 = "1652cl6sa9d71c685xpwqv5hgz3spxg2hynwcnn8xybn5hv9ar4r";
+      name = "dragon-16.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz";
-      sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd";
-      name = "eventviews-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/eventviews-16.12.3.tar.xz";
+      sha256 = "0z8jznvw2nhszrlll7458gb4r0585ivkbq9dqplkw2mdrv7vxz5c";
+      name = "eventviews-16.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz";
-      sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc";
-      name = "ffmpegthumbs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ffmpegthumbs-16.12.3.tar.xz";
+      sha256 = "1scyyd85rs21rv3ghcxv7pw3aa2nl703gi4dpikbsd7wjmxixzq9";
+      name = "ffmpegthumbs-16.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz";
-      sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw";
-      name = "filelight-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/filelight-16.12.3.tar.xz";
+      sha256 = "13gcx1w9zq3i9fy32m3ypjyqcd9vrkqyr0j4cbqfvhpzv2chk3is";
+      name = "filelight-16.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz";
-      sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd";
-      name = "granatier-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/granatier-16.12.3.tar.xz";
+      sha256 = "17vpz6jz2vvpvsrhvllglacrwg0sxy15aqnm8n6d73sk9zlv9n76";
+      name = "granatier-16.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz";
-      sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9";
-      name = "grantlee-editor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/grantlee-editor-16.12.3.tar.xz";
+      sha256 = "007q6cb5f3vzw6dwm2y2b5m3dhb5mws5b6083ssm8rydycyi9pzi";
+      name = "grantlee-editor-16.12.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz";
-      sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2";
-      name = "grantleetheme-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/grantleetheme-16.12.3.tar.xz";
+      sha256 = "19mka62p75qnv6r9ib70y25jjj3bpziz0xqihfkb6jvafrgy8p8k";
+      name = "grantleetheme-16.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz";
-      sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr";
-      name = "gwenview-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/gwenview-16.12.3.tar.xz";
+      sha256 = "069fblw9g9h6r9gy05nj2n93jpnsx610jncwl6403q01rwlbrgbr";
+      name = "gwenview-16.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz";
-      sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym";
-      name = "incidenceeditor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/incidenceeditor-16.12.3.tar.xz";
+      sha256 = "11jplw3fngnyvpjkhqwv1gzzwxxcm4v93h09f68hs015apncjvpp";
+      name = "incidenceeditor-16.12.3.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz";
-      sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy";
-      name = "jovie-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/jovie-16.12.3.tar.xz";
+      sha256 = "190c4g587x4wxbfksf0mszq5qv1pzny6bkd3w2pwwsj222bl0fxa";
+      name = "jovie-16.12.3.tar.xz";
     };
   };
   juk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz";
-      sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c";
-      name = "juk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/juk-16.12.3.tar.xz";
+      sha256 = "1ssgia5sknam2hnjflzglv0khxbwyyvzm4w1wmxw04rbjzs4gi4h";
+      name = "juk-16.12.3.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz";
-      sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r";
-      name = "kaccessible-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaccessible-16.12.3.tar.xz";
+      sha256 = "162a4pw61b3rhq5mf7zdhgyyhbrxhr9fjw7bidicw7aljiy2cwb9";
+      name = "kaccessible-16.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz";
-      sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv";
-      name = "kaccounts-integration-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-integration-16.12.3.tar.xz";
+      sha256 = "0w8h33sysf590xyg4bvf2a2z39kzc0wn6mxv31mrf68b6ks7b9h2";
+      name = "kaccounts-integration-16.12.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz";
-      sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g";
-      name = "kaccounts-providers-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-providers-16.12.3.tar.xz";
+      sha256 = "0iqqwfjadsf7nhrqvpzypazipris4ljhf6daprxwxqa2bfigr5j2";
+      name = "kaccounts-providers-16.12.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz";
-      sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2";
-      name = "kaddressbook-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaddressbook-16.12.3.tar.xz";
+      sha256 = "1a86asy0pw8ivyg7aaw2mais4xbplabp5aljzcyb2rykij6482rh";
+      name = "kaddressbook-16.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz";
-      sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn";
-      name = "kajongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kajongg-16.12.3.tar.xz";
+      sha256 = "0xwwkl2npls0aq4435xlcvssm8pmfhramjgxv70mnjapr0dlpk5c";
+      name = "kajongg-16.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz";
-      sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk";
-      name = "kalarm-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalarm-16.12.3.tar.xz";
+      sha256 = "1n3h252cvqib1bx4ryq3xgj2mkqr38wvhiyj2vkkll4pf5lphpqz";
+      name = "kalarm-16.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz";
-      sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s";
-      name = "kalarmcal-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalarmcal-16.12.3.tar.xz";
+      sha256 = "064sihcsbdi1w6viv5gq6sw2m8r7x3nn1hl2aji1109pf5913vbr";
+      name = "kalarmcal-16.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz";
-      sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd";
-      name = "kalgebra-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalgebra-16.12.3.tar.xz";
+      sha256 = "0qhini5gm41dlyham4zzqgz6r11s2rfwwphb81xvwp1bgn8q2rqb";
+      name = "kalgebra-16.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz";
-      sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh";
-      name = "kalzium-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalzium-16.12.3.tar.xz";
+      sha256 = "0rlfjqfb1vpr0cdcx429nvrbkr7kc1m4ps3z3pphkajq4vlrql8i";
+      name = "kalzium-16.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz";
-      sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd";
-      name = "kamera-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kamera-16.12.3.tar.xz";
+      sha256 = "04p19qv5ssf5wlpfqzhqsi8281pzcdjkd0jy177f9r7qgqq4lkgr";
+      name = "kamera-16.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz";
-      sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1";
-      name = "kanagram-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kanagram-16.12.3.tar.xz";
+      sha256 = "183hkxxwf7h335gmfvi2lppsyhpv80lvlg1fg4whq79f1d2lrw47";
+      name = "kanagram-16.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz";
-      sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq";
-      name = "kapman-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kapman-16.12.3.tar.xz";
+      sha256 = "1if3dzn1qy2pr42zcmzpq7f38spkxh492gl12vndckzah67cmz4g";
+      name = "kapman-16.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz";
-      sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc";
-      name = "kapptemplate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kapptemplate-16.12.3.tar.xz";
+      sha256 = "036npdxyh9rx0aaiwvdjqrb39f8bqglqbl3iddb1vh7w9p1h158n";
+      name = "kapptemplate-16.12.3.tar.xz";
     };
   };
   kate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz";
-      sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p";
-      name = "kate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kate-16.12.3.tar.xz";
+      sha256 = "1fbrdlf64bdj71g692fkk7fiym0nm9vvbki2q105carrhl4w9s0r";
+      name = "kate-16.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz";
-      sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68";
-      name = "katomic-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/katomic-16.12.3.tar.xz";
+      sha256 = "14dnfjww1fzgz3nbg45ck5yqbxdyvp0la9qs4n5cjy1ym52k5pjm";
+      name = "katomic-16.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz";
-      sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k";
-      name = "kblackbox-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblackbox-16.12.3.tar.xz";
+      sha256 = "0i359pq65swrzsb7vdk0m00vjrj2xgvbgxin8ly2cijqlmfd3iv8";
+      name = "kblackbox-16.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz";
-      sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790";
-      name = "kblocks-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblocks-16.12.3.tar.xz";
+      sha256 = "09kdbwya4xl84vzayhz286lmfb6a0mmp9i40hzldfl59as4d67kw";
+      name = "kblocks-16.12.3.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz";
-      sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877";
-      name = "kblog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblog-16.12.3.tar.xz";
+      sha256 = "0q1qswg7dgy0jvk9kaz6cps6sfddsmv0lp5r3nhk751l497bbl3x";
+      name = "kblog-16.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz";
-      sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm";
-      name = "kbounce-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbounce-16.12.3.tar.xz";
+      sha256 = "0cwvsbw0a60a2csxqvpkm3znbcd1whsl80v63ljyc3gyik7wxil0";
+      name = "kbounce-16.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz";
-      sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y";
-      name = "kbreakout-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbreakout-16.12.3.tar.xz";
+      sha256 = "0zszxxw7r7ggxhc47pngsi7bl57mnhbzkb0bhvy5rcyamgi90v39";
+      name = "kbreakout-16.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz";
-      sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi";
-      name = "kbruch-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbruch-16.12.3.tar.xz";
+      sha256 = "12zmp9ix8q9mf3a4xpbsr0y9h4g1srwx48604x1phdwwdhgx0gsj";
+      name = "kbruch-16.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz";
-      sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv";
-      name = "kcachegrind-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcachegrind-16.12.3.tar.xz";
+      sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
+      name = "kcachegrind-16.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz";
-      sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0";
-      name = "kcalc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalc-16.12.3.tar.xz";
+      sha256 = "06kfz1d5i01h31v277y04pqnx08yv0050rlb6phv72cx6div4mgp";
+      name = "kcalc-16.12.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz";
-      sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd";
-      name = "kcalcore-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalcore-16.12.3.tar.xz";
+      sha256 = "09i43vs6jpjmmk52df6pzclh0jn8shn3wfnaivw2wlirwa60d901";
+      name = "kcalcore-16.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz";
-      sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci";
-      name = "kcalutils-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalutils-16.12.3.tar.xz";
+      sha256 = "0449029fa1w496fmb81csb5amk801n11ish450drqw34lp9qla4n";
+      name = "kcalutils-16.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz";
-      sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc";
-      name = "kcharselect-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcharselect-16.12.3.tar.xz";
+      sha256 = "1iwqqds9fy970ykgq1xbpbrzpdacy1h4bw87h1jingi42z1jkw2n";
+      name = "kcharselect-16.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz";
-      sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm";
-      name = "kcolorchooser-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcolorchooser-16.12.3.tar.xz";
+      sha256 = "13nkvxl3z2l3m6zs057ipxgqfgsw7gma1rs66maqhzl30k3hrcyb";
+      name = "kcolorchooser-16.12.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz";
-      sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l";
-      name = "kcontacts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcontacts-16.12.3.tar.xz";
+      sha256 = "1479g32c9532pjgmfpy38vycii1sxk1nzv27z7wbgpxch6735szx";
+      name = "kcontacts-16.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz";
-      sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2";
-      name = "kcron-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcron-16.12.3.tar.xz";
+      sha256 = "0whxc9h7qn0fwcca9sq6qy0j4hfb8xlkdypnb6gspl687ws799xz";
+      name = "kcron-16.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz";
-      sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv";
-      name = "kdebugsettings-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdebugsettings-16.12.3.tar.xz";
+      sha256 = "0mkhklv4dynz23w8w9yh5qspdlfp3hi6fyiijyfwj358rqgbf3p5";
+      name = "kdebugsettings-16.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz";
-      sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx";
-      name = "kde-dev-scripts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-scripts-16.12.3.tar.xz";
+      sha256 = "0kiddn0wg90p98zgnpq3x2hcfw8xczn98nyd21zbkzz357v14pya";
+      name = "kde-dev-scripts-16.12.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz";
-      sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f";
-      name = "kde-dev-utils-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-utils-16.12.3.tar.xz";
+      sha256 = "0svbl7yd5vz285gaymxy5mz0ll6fviamrbd6fjhj7rc4qx1gjgin";
+      name = "kde-dev-utils-16.12.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz";
-      sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b";
-      name = "kdeedu-data-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdeedu-data-16.12.3.tar.xz";
+      sha256 = "0vqzamp5fc2d0i9qn6986f3a1s1fdbrlzrsnimpdfcas5xngbv5m";
+      name = "kdeedu-data-16.12.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz";
-      sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8";
-      name = "kdegraphics-mobipocket-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-mobipocket-16.12.3.tar.xz";
+      sha256 = "06zqny8idaw7s85h7iprbwdp7y1qspfp7yh5klwav12p72nn54w2";
+      name = "kdegraphics-mobipocket-16.12.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz";
-      sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3";
-      name = "kdegraphics-thumbnailers-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-thumbnailers-16.12.3.tar.xz";
+      sha256 = "01q2czzqq240cbp9yg7mji2q15kmiwn1aqs6iii00i56yy2mwaxq";
+      name = "kdegraphics-thumbnailers-16.12.3.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz";
-      sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim";
-      name = "kde-l10n-ar-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ar-16.12.3.tar.xz";
+      sha256 = "1a6in9zq0a4a1v7mijm7gdrprkb5djp4qzyrbrwwlyzpk0sjs153";
+      name = "kde-l10n-ar-16.12.3.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz";
-      sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l";
-      name = "kde-l10n-ast-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ast-16.12.3.tar.xz";
+      sha256 = "05di4xbm8viam0lz6gsyl8zip01dan5bb3h1ib7n7ri4rd49gb13";
+      name = "kde-l10n-ast-16.12.3.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz";
-      sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0";
-      name = "kde-l10n-bg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bg-16.12.3.tar.xz";
+      sha256 = "1clqz50ri2zpsaqvlwq01jc44d2w4abpwaqd37jcvcpjg836kj32";
+      name = "kde-l10n-bg-16.12.3.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz";
-      sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn";
-      name = "kde-l10n-bs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bs-16.12.3.tar.xz";
+      sha256 = "1lfpq4lixamh08vmmj8ai8pzdybs1anlg8vfb6lnxj3dpplxxjdv";
+      name = "kde-l10n-bs-16.12.3.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz";
-      sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2";
-      name = "kde-l10n-ca-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca-16.12.3.tar.xz";
+      sha256 = "1h3d7gdpixiqn4gyk1z9lj5k4bhf4719w1rcfzcajrpwrmvdfvms";
+      name = "kde-l10n-ca-16.12.3.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.2";
+    version = "ca_valencia-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz";
-      sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01";
-      name = "kde-l10n-ca_valencia-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca@valencia-16.12.3.tar.xz";
+      sha256 = "00g1124n84lq380srykcr4yigqr5w9xivssj27jf1ak40vyanln0";
+      name = "kde-l10n-ca_valencia-16.12.3.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz";
-      sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg";
-      name = "kde-l10n-cs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-cs-16.12.3.tar.xz";
+      sha256 = "0nvl0lbg1pw1r73ggycfqjvlga6lg7gyin4bigyjcq41k9y6xf91";
+      name = "kde-l10n-cs-16.12.3.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz";
-      sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h";
-      name = "kde-l10n-da-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-da-16.12.3.tar.xz";
+      sha256 = "1bsv0z0q5fqgn2jkgazm3aazi6s9crz23acwx9p2w7fc7h98bqpq";
+      name = "kde-l10n-da-16.12.3.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz";
-      sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh";
-      name = "kde-l10n-de-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-de-16.12.3.tar.xz";
+      sha256 = "0ym6f1n86rvbwdk0xlx2ajfv4l70kw3qir8z82d2jf5dhgz9h2k6";
+      name = "kde-l10n-de-16.12.3.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz";
-      sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq";
-      name = "kde-l10n-el-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-el-16.12.3.tar.xz";
+      sha256 = "1dd51kh52rq9y3r2iz985ib2bpi109vf2xv2abkm8ddsfmb1mq6c";
+      name = "kde-l10n-el-16.12.3.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.2";
+    version = "en_GB-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz";
-      sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs";
-      name = "kde-l10n-en_GB-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-en_GB-16.12.3.tar.xz";
+      sha256 = "0yc6fk5ak0442gv1gxwwz2zz13s9d1ihlfkvl8aqi6zky5b6c91n";
+      name = "kde-l10n-en_GB-16.12.3.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz";
-      sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527";
-      name = "kde-l10n-eo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eo-16.12.3.tar.xz";
+      sha256 = "0p43p1as9s2x4145k59li39fvg77c38mjnlb16zhb5bg5c0r1401";
+      name = "kde-l10n-eo-16.12.3.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz";
-      sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi";
-      name = "kde-l10n-es-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-es-16.12.3.tar.xz";
+      sha256 = "194svk1axicbijy4ywsrn1q27pzrm3g139i63388qh3lzv8654p1";
+      name = "kde-l10n-es-16.12.3.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz";
-      sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj";
-      name = "kde-l10n-et-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-et-16.12.3.tar.xz";
+      sha256 = "1q0mrc517jr5hicklhzvs6vw5vwgvb2gj3fi93a9iqxbw1a794pk";
+      name = "kde-l10n-et-16.12.3.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz";
-      sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb";
-      name = "kde-l10n-eu-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eu-16.12.3.tar.xz";
+      sha256 = "0dgwklynwwksdm0dxk8dm53y0v92kfin6vgwpn2scc97fns16r08";
+      name = "kde-l10n-eu-16.12.3.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz";
-      sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964";
-      name = "kde-l10n-fa-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fa-16.12.3.tar.xz";
+      sha256 = "1ywipqg2dv3dapp3m7sfhap4izhabb4srk3gpl2kd2wx0abnwmdb";
+      name = "kde-l10n-fa-16.12.3.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz";
-      sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j";
-      name = "kde-l10n-fi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fi-16.12.3.tar.xz";
+      sha256 = "11grklvacq70mq4fj0772v8xqmp1b1pl7gff8gvy692rva5qhv29";
+      name = "kde-l10n-fi-16.12.3.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz";
-      sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as";
-      name = "kde-l10n-fr-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fr-16.12.3.tar.xz";
+      sha256 = "0qx849ilp1597nxrx6cmgnmm202all14y8pcyd19gp70wdra8wcm";
+      name = "kde-l10n-fr-16.12.3.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz";
-      sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86";
-      name = "kde-l10n-ga-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ga-16.12.3.tar.xz";
+      sha256 = "06w92m84bxqs06gyi45x1jmzh99ip7vnnzjq7ixx7ny9k6m0as1m";
+      name = "kde-l10n-ga-16.12.3.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz";
-      sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70";
-      name = "kde-l10n-gl-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-gl-16.12.3.tar.xz";
+      sha256 = "1k6jydmqbmxfkimxqn8qhd136zdjz4z7d5mk0n80607n91y7n3kv";
+      name = "kde-l10n-gl-16.12.3.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz";
-      sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk";
-      name = "kde-l10n-he-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-he-16.12.3.tar.xz";
+      sha256 = "1ry1wd9ng5xwpi402p1rqbsrb0ma7bgkmx53yygzc5mpszarga6y";
+      name = "kde-l10n-he-16.12.3.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz";
-      sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b";
-      name = "kde-l10n-hi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hi-16.12.3.tar.xz";
+      sha256 = "1qwjiarqi8c3b15nc2nqrxvb6pcrb232qcx6nz0f9day2d0zxdwk";
+      name = "kde-l10n-hi-16.12.3.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz";
-      sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f";
-      name = "kde-l10n-hr-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hr-16.12.3.tar.xz";
+      sha256 = "0y3pvdy1pkhraahsfkwhkar6004ll19gd6rhhhzgaw0irmw1yxp1";
+      name = "kde-l10n-hr-16.12.3.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz";
-      sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g";
-      name = "kde-l10n-hu-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hu-16.12.3.tar.xz";
+      sha256 = "001pl0l0cj4f2j7c6fjv9jv4wnkk2zb428y8szqm78zg85ms9wpz";
+      name = "kde-l10n-hu-16.12.3.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz";
-      sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c";
-      name = "kde-l10n-ia-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ia-16.12.3.tar.xz";
+      sha256 = "09p9r6xzirr6cwcjdg10db62g3d4z0ksl6caf45rz0i2k5zn4r6r";
+      name = "kde-l10n-ia-16.12.3.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz";
-      sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz";
-      name = "kde-l10n-id-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-id-16.12.3.tar.xz";
+      sha256 = "1kanlr401ljaaqijhdvv52lvrn90m9b0l6i2jly8mdnnnwp896ra";
+      name = "kde-l10n-id-16.12.3.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz";
-      sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv";
-      name = "kde-l10n-is-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-is-16.12.3.tar.xz";
+      sha256 = "10a9sxjnv9xb9wy04b9pfwpj4xg22x0ami37jhwggpskl9sj736v";
+      name = "kde-l10n-is-16.12.3.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz";
-      sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m";
-      name = "kde-l10n-it-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-it-16.12.3.tar.xz";
+      sha256 = "0f771kli3zw6dgwdxgk19kiy6gwv9yj3f2cgiyxaiak8yawa9ary";
+      name = "kde-l10n-it-16.12.3.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz";
-      sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai";
-      name = "kde-l10n-ja-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ja-16.12.3.tar.xz";
+      sha256 = "1p0arv340i34gdlkdbjw234c9a4jqy8z417f0p19pn6ic3i5i6yv";
+      name = "kde-l10n-ja-16.12.3.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz";
-      sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn";
-      name = "kde-l10n-kk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-kk-16.12.3.tar.xz";
+      sha256 = "1ik3abczhxkm2b8i22akz12q5lm7rsc7i4qdz6ml1sn4kd0949i5";
+      name = "kde-l10n-kk-16.12.3.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz";
-      sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk";
-      name = "kde-l10n-km-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-km-16.12.3.tar.xz";
+      sha256 = "1lwpfkv87i6km9pxrm78cqnnb1jnysaij0lmgvz2d0bs6dldaxrs";
+      name = "kde-l10n-km-16.12.3.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz";
-      sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g";
-      name = "kde-l10n-ko-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ko-16.12.3.tar.xz";
+      sha256 = "0c0hkprngxyxj2sf05s5i0y04i5f4vgqis1mgq500l03q0x16b4y";
+      name = "kde-l10n-ko-16.12.3.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz";
-      sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5";
-      name = "kde-l10n-lt-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lt-16.12.3.tar.xz";
+      sha256 = "04d2l2qisbpzxppxchfrxnijc8706pq3s9pgmyyy6c0v26gsgz77";
+      name = "kde-l10n-lt-16.12.3.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz";
-      sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d";
-      name = "kde-l10n-lv-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lv-16.12.3.tar.xz";
+      sha256 = "1af13p7ri4x3dhwlv30gf7za7dgsr1kx3khzlgdg4hcgi2s4aq12";
+      name = "kde-l10n-lv-16.12.3.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz";
-      sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8";
-      name = "kde-l10n-mr-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-mr-16.12.3.tar.xz";
+      sha256 = "16g8ln11x9qpda4wgzwvvij77bdpsdd6vsh7ysik8fc87km4qkax";
+      name = "kde-l10n-mr-16.12.3.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz";
-      sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z";
-      name = "kde-l10n-nb-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nb-16.12.3.tar.xz";
+      sha256 = "091wm8z6ibw8by220j89xdf0vpk7dp341hph2dhz17ykdzck3cdf";
+      name = "kde-l10n-nb-16.12.3.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz";
-      sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8";
-      name = "kde-l10n-nds-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nds-16.12.3.tar.xz";
+      sha256 = "052nw25rd3vq0fkixcwmn1iwaxnfwcg7iarf78c276w6vzrbvvcc";
+      name = "kde-l10n-nds-16.12.3.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz";
-      sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch";
-      name = "kde-l10n-nl-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nl-16.12.3.tar.xz";
+      sha256 = "0axlpjq70142blccsfqbh7zs7l8k31mkc30lr79d03975dp2ivzi";
+      name = "kde-l10n-nl-16.12.3.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz";
-      sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif";
-      name = "kde-l10n-nn-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nn-16.12.3.tar.xz";
+      sha256 = "0ql8pvj47kwvdaj2gsjlc4rxb7mpl9nv4fraavffinv4xzrh0v18";
+      name = "kde-l10n-nn-16.12.3.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz";
-      sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3";
-      name = "kde-l10n-pa-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pa-16.12.3.tar.xz";
+      sha256 = "0r2snb5bkvha8yj692g1y8xwdwcnav06w3qliz1v7jiyb6hv8ncm";
+      name = "kde-l10n-pa-16.12.3.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz";
-      sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav";
-      name = "kde-l10n-pl-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pl-16.12.3.tar.xz";
+      sha256 = "1bp8br37wfn3xlxl4hzr45sv41w2i562rgjcj25ngn27y7cqvwq5";
+      name = "kde-l10n-pl-16.12.3.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz";
-      sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z";
-      name = "kde-l10n-pt-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt-16.12.3.tar.xz";
+      sha256 = "1f3ray689q3w4yr20j0bj8vvwyb1qzi608ip0p6n4nzjkq3ycqh6";
+      name = "kde-l10n-pt-16.12.3.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.2";
+    version = "pt_BR-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz";
-      sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379";
-      name = "kde-l10n-pt_BR-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt_BR-16.12.3.tar.xz";
+      sha256 = "06h0dp54n8brv7kcfdbxy3yxk6c5b1ncbd9fzmflr8bpivifj66s";
+      name = "kde-l10n-pt_BR-16.12.3.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz";
-      sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3";
-      name = "kde-l10n-ro-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ro-16.12.3.tar.xz";
+      sha256 = "17kbkh50jf8zb9p3kl2malddvq08ybg881x1w5gmw514k3d3hwxh";
+      name = "kde-l10n-ro-16.12.3.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz";
-      sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6";
-      name = "kde-l10n-ru-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ru-16.12.3.tar.xz";
+      sha256 = "12ghgwy84i6nmlgi8wmvhxn7d9mvanhyd6pqyd302r5x0zxd8rza";
+      name = "kde-l10n-ru-16.12.3.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz";
-      sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1";
-      name = "kde-l10n-sk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sk-16.12.3.tar.xz";
+      sha256 = "0hc1cm2npsw2w9mx09kn9jxvaqpjhv6snhwdi2mybpbs9qmgnzcn";
+      name = "kde-l10n-sk-16.12.3.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz";
-      sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4";
-      name = "kde-l10n-sl-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sl-16.12.3.tar.xz";
+      sha256 = "02d0fg40pvlr6wnxg425n3fpqpizvdppznyp8nnxbzb9ia583aw0";
+      name = "kde-l10n-sl-16.12.3.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz";
-      sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy";
-      name = "kde-l10n-sr-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz";
+      sha256 = "1yq44dykajcz4n10zrad85lji30phr9cm5dnmx4s08404qwh68cz";
+      name = "kde-l10n-sr-16.12.3.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz";
-      sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w";
-      name = "kde-l10n-sv-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sv-16.12.3.tar.xz";
+      sha256 = "1q8ags96jwjrihi8ai8139c3s9nfy7v7lss9ci3xl786hyggdlrb";
+      name = "kde-l10n-sv-16.12.3.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz";
-      sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r";
-      name = "kde-l10n-tr-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-tr-16.12.3.tar.xz";
+      sha256 = "1l24d0abhhlbam0wfz52495nvjy1blfid9h31233hkykb782gi0n";
+      name = "kde-l10n-tr-16.12.3.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz";
-      sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x";
-      name = "kde-l10n-ug-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ug-16.12.3.tar.xz";
+      sha256 = "0sb4136wjyg9g1fvhcgqv97wpv82ia37aknd8xcvjnp5n2jl80nn";
+      name = "kde-l10n-ug-16.12.3.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz";
-      sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv";
-      name = "kde-l10n-uk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-uk-16.12.3.tar.xz";
+      sha256 = "073pqvxbpibwd1bv0vh4rijgkhg061g2gaaaqnckaakw677g2bmz";
+      name = "kde-l10n-uk-16.12.3.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz";
-      sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j";
-      name = "kde-l10n-wa-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-wa-16.12.3.tar.xz";
+      sha256 = "14qms294pz7hf4ramhscif9n6jfk5ixfwww558ypi0lwnzc17mrf";
+      name = "kde-l10n-wa-16.12.3.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.2";
+    version = "zh_CN-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz";
-      sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w";
-      name = "kde-l10n-zh_CN-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_CN-16.12.3.tar.xz";
+      sha256 = "01q92gc13wjpd2gzvn1sipgl5xs86mwq8y0583glsx7s2wfp3g41";
+      name = "kde-l10n-zh_CN-16.12.3.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.2";
+    version = "zh_TW-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz";
-      sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna";
-      name = "kde-l10n-zh_TW-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_TW-16.12.3.tar.xz";
+      sha256 = "0a9xnxlbr5469k1ij7hc8wa5p38r3yqq1d9fxmmpqyj111v63g3h";
+      name = "kde-l10n-zh_TW-16.12.3.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.29";
+    version = "4.14.30";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz";
-      sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv";
-      name = "kdelibs-4.14.29.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdelibs-4.14.30.tar.xz";
+      sha256 = "0v8r70d55c4jhfhnh8lj41584qggc2lb4f6jwm4yl9qc6bpw77x3";
+      name = "kdelibs-4.14.30.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz";
-      sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5";
-      name = "kdenetwork-filesharing-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdenetwork-filesharing-16.12.3.tar.xz";
+      sha256 = "0345wq7ayahfd2jlpgfs18c7nrdp9gn9yxig2x75pspqmb5pgxh7";
+      name = "kdenetwork-filesharing-16.12.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz";
-      sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7";
-      name = "kdenlive-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdenlive-16.12.3.tar.xz";
+      sha256 = "1z7afrx00yaracf6cv9p8r14gqampabya8li6ws1ihzdgfamlkd0";
+      name = "kdenlive-16.12.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz";
-      sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn";
-      name = "kdepim-addons-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdepim-addons-16.12.3.tar.xz";
+      sha256 = "1hqm7vi7fy7s17djayq9q7l3dxdnzk2ii78mjdg90aac9cxdxgmm";
+      name = "kdepim-addons-16.12.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz";
-      sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9";
-      name = "kdepim-apps-libs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdepim-apps-libs-16.12.3.tar.xz";
+      sha256 = "1q4ksp377piqxbs843nxafzssz80ayjii90iz86r2z2rd3lyrjzw";
+      name = "kdepim-apps-libs-16.12.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz";
-      sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz";
-      name = "kdepim-runtime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdepim-runtime-16.12.3.tar.xz";
+      sha256 = "0j5c3y8bqnffcrx4g7ilq7id46h11d1hiw81l7x4mg1p0zw07bg1";
+      name = "kdepim-runtime-16.12.3.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz";
-      sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x";
-      name = "kde-runtime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kde-runtime-16.12.3.tar.xz";
+      sha256 = "1sqp827l30adiqrp12djx3xk6mlz2lb46hmxnbnzv52mv2whcr3y";
+      name = "kde-runtime-16.12.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz";
-      sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1";
-      name = "kdesdk-kioslaves-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-kioslaves-16.12.3.tar.xz";
+      sha256 = "17zqp43a1266616h3g6yccjmfgwni6lr8lz4rrvfda275vvwbshj";
+      name = "kdesdk-kioslaves-16.12.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz";
-      sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24";
-      name = "kdesdk-thumbnailers-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-thumbnailers-16.12.3.tar.xz";
+      sha256 = "0p2s6pyq16jmjv29r8n9ygvsh1dxgz9zk90mk138cxxhbx9nks9h";
+      name = "kdesdk-thumbnailers-16.12.3.tar.xz";
     };
   };
   kdf = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz";
-      sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k";
-      name = "kdf-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdf-16.12.3.tar.xz";
+      sha256 = "1502ib1hlc5xxsphspxwj8jvjm7qig0zdwckvm3nmh7hf4474sc5";
+      name = "kdf-16.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz";
-      sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189";
-      name = "kdialog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdialog-16.12.3.tar.xz";
+      sha256 = "161barz5x9jrdk2p5hqc2vk1rqfwn8nlhdmc1vjqnhvww786ghmh";
+      name = "kdialog-16.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz";
-      sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs";
-      name = "kdiamond-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdiamond-16.12.3.tar.xz";
+      sha256 = "0qdh9ngrz5ph0kly27c58sxhwamqm3wq566337yhdqjizzcin4pf";
+      name = "kdiamond-16.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz";
-      sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p";
-      name = "keditbookmarks-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/keditbookmarks-16.12.3.tar.xz";
+      sha256 = "0dn3jb5lsjj2c6pbrbn4cik68fqqk99ljl45vbal9cc27lmrfa2n";
+      name = "keditbookmarks-16.12.3.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz";
-      sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky";
-      name = "kfilereplace-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfilereplace-16.12.3.tar.xz";
+      sha256 = "0gym9bmkyjwg97khy6xxiaidjp6wi98fzmk7wa97wbdqc0qvswja";
+      name = "kfilereplace-16.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz";
-      sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm";
-      name = "kfind-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfind-16.12.3.tar.xz";
+      sha256 = "1d7rn3xri4dgv97s6jw3n4cbsg73zyrbcm3ligxgj37ziggrhgsj";
+      name = "kfind-16.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz";
-      sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm";
-      name = "kfloppy-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfloppy-16.12.3.tar.xz";
+      sha256 = "07mgrpjqd2kdz5gmg8ylmvdb4mis328b7qlchszdx0l1z30kqkzp";
+      name = "kfloppy-16.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz";
-      sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix";
-      name = "kfourinline-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfourinline-16.12.3.tar.xz";
+      sha256 = "087c00sggx5i1g8i2rjvvwlys15bisgx9fm2nl8f30h2ba3im4sg";
+      name = "kfourinline-16.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz";
-      sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6";
-      name = "kgeography-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgeography-16.12.3.tar.xz";
+      sha256 = "1rnk00nj29zimpw36vhm0yrwlmpmxwv9wzxnhr7n2jq5qhbqsp5g";
+      name = "kgeography-16.12.3.tar.xz";
     };
   };
   kget = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz";
-      sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj";
-      name = "kget-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kget-16.12.3.tar.xz";
+      sha256 = "0h8nklsl6gddwzgjig5cwp463s96ffn5688zjlsyx4hphnvbj8kb";
+      name = "kget-16.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz";
-      sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy";
-      name = "kgoldrunner-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgoldrunner-16.12.3.tar.xz";
+      sha256 = "028kz5x8a3jb3zp3vfxajmszrqk859hdln9175pp6zj78b278xz4";
+      name = "kgoldrunner-16.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz";
-      sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr";
-      name = "kgpg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgpg-16.12.3.tar.xz";
+      sha256 = "0abh15j2p0vinskd8f1yvjkyi1a70k0wf1sdldrfdwpdgq1pqsxw";
+      name = "kgpg-16.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz";
-      sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s";
-      name = "khangman-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/khangman-16.12.3.tar.xz";
+      sha256 = "03ffigr9a6n3aj1a7lxcw9wgf1pafdjwqjnwnny2ric5vn6lpq1z";
+      name = "khangman-16.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz";
-      sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9";
-      name = "khelpcenter-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/khelpcenter-16.12.3.tar.xz";
+      sha256 = "100xcjjjbszhbwgydbylk9m9lrxikjyazmhaq2rvv2mfzsbijjm7";
+      name = "khelpcenter-16.12.3.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz";
-      sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n";
-      name = "kholidays-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kholidays-16.12.3.tar.xz";
+      sha256 = "09iwkqpnmn3h7yfin4y9izb2sdk6hrm8rfq106cnz7j8i31q93ad";
+      name = "kholidays-16.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz";
-      sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p";
-      name = "kidentitymanagement-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kidentitymanagement-16.12.3.tar.xz";
+      sha256 = "1b23cwdhc7rv260kmn4akff3jfa21hk49p0kp8p0mf6nw6qahbvp";
+      name = "kidentitymanagement-16.12.3.tar.xz";
     };
   };
   kig = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz";
-      sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g";
-      name = "kig-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kig-16.12.3.tar.xz";
+      sha256 = "0fnlgxwcnspaqzv4y40xm0kq3xwwd4r5abh7ssbd6iqsbzgm6ghw";
+      name = "kig-16.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz";
-      sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c";
-      name = "kigo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kigo-16.12.3.tar.xz";
+      sha256 = "08rdz91jzz79884xhg87cwy57q1jk2414shyxxy9r0pb4wdcdbhn";
+      name = "kigo-16.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz";
-      sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy";
-      name = "killbots-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/killbots-16.12.3.tar.xz";
+      sha256 = "0lwniwm8cbnwpqhfis38x5qvkz53626v9bn00amml57zj8x3hjnd";
+      name = "killbots-16.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz";
-      sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6";
-      name = "kimagemapeditor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kimagemapeditor-16.12.3.tar.xz";
+      sha256 = "0362zcj6by3kydr5v3sr7l6k9kkyfcy16879f93d1qqkjfi11cic";
+      name = "kimagemapeditor-16.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz";
-      sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87";
-      name = "kimap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kimap-16.12.3.tar.xz";
+      sha256 = "1jlva17hy500jpb5mg6m3vrcy6mqikcy8m1pgy68d2ip0m93rb5f";
+      name = "kimap-16.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz";
-      sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp";
-      name = "kio-extras-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kio-extras-16.12.3.tar.xz";
+      sha256 = "1mfpllrmc88khlpg3yd4sghs8igg8dh0x568jw46vv90qgdb9xss";
+      name = "kio-extras-16.12.3.tar.xz";
     };
   };
   kiriki = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz";
-      sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk";
-      name = "kiriki-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kiriki-16.12.3.tar.xz";
+      sha256 = "142p2zv1826iclaa2zrfyzfdwnflh3sq2xymca4di5anrmcwmm2m";
+      name = "kiriki-16.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz";
-      sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8";
-      name = "kiten-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kiten-16.12.3.tar.xz";
+      sha256 = "0skwgv3v79p5z1livjbdsg7i18ky8vc49z53dmgsgbziqvs0s2y4";
+      name = "kiten-16.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz";
-      sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh";
-      name = "kjumpingcube-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kjumpingcube-16.12.3.tar.xz";
+      sha256 = "1fii1arzpsdhnnb5yladhpsb0g6icald5si0fwnl47wg3gshaqiz";
+      name = "kjumpingcube-16.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz";
-      sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x";
-      name = "kldap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kldap-16.12.3.tar.xz";
+      sha256 = "0a7pm9dzcvyyznqs4apwdl6dpg87qhxcr3a06grjwxhqvfdl52na";
+      name = "kldap-16.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz";
-      sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl";
-      name = "kleopatra-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kleopatra-16.12.3.tar.xz";
+      sha256 = "1ja26gzdj8h5f8w1061scl40p6ahba3ci4hp91n2vp3rrz9m96wa";
+      name = "kleopatra-16.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz";
-      sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f";
-      name = "klettres-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klettres-16.12.3.tar.xz";
+      sha256 = "0m3k3zyrw7rwm6ad75c86bap80v2y5k938mdhqjaciglqc9pk83h";
+      name = "klettres-16.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz";
-      sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93";
-      name = "klickety-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klickety-16.12.3.tar.xz";
+      sha256 = "0mim86wxcljs192q9y6a6i326sic350jd89m1vx3p78dwpj35q42";
+      name = "klickety-16.12.3.tar.xz";
     };
   };
   klines = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz";
-      sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q";
-      name = "klines-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klines-16.12.3.tar.xz";
+      sha256 = "03ran5hyl8p9vfi82m2pkzng9hn5ipx1plgq9bz25c53z5fg63di";
+      name = "klines-16.12.3.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz";
-      sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60";
-      name = "klinkstatus-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klinkstatus-16.12.3.tar.xz";
+      sha256 = "0kmjh0398k6fpz6lgz6d5rb79xl6wpgd4j56zacpha9046cfnmsk";
+      name = "klinkstatus-16.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz";
-      sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23";
-      name = "kmag-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmag-16.12.3.tar.xz";
+      sha256 = "1llv9vd1557h4lz2sdd1wjlqb9wzrk9jxn4731iac2b5wdwpihii";
+      name = "kmag-16.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz";
-      sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij";
-      name = "kmahjongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmahjongg-16.12.3.tar.xz";
+      sha256 = "0xy3w5kxn69l0dagly5qd9dqzkpikflmrjbv1b45psafdmj3125r";
+      name = "kmahjongg-16.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz";
-      sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql";
-      name = "kmail-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmail-16.12.3.tar.xz";
+      sha256 = "1kyhc952k78yg2wa9cgxvqa6qrrgc08dly7fin7as8cxfh49i0b0";
+      name = "kmail-16.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz";
-      sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5";
-      name = "kmail-account-wizard-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmail-account-wizard-16.12.3.tar.xz";
+      sha256 = "0w94v2c38sl0qnyr38yzlfj6pxixaziw5kb4fkawv26c18fi42pl";
+      name = "kmail-account-wizard-16.12.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz";
-      sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn";
-      name = "kmailtransport-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmailtransport-16.12.3.tar.xz";
+      sha256 = "1dkw7niymhnf0jncflvqyldw28c9j0q6j598flb5ksds0n30iasy";
+      name = "kmailtransport-16.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz";
-      sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j";
-      name = "kmbox-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmbox-16.12.3.tar.xz";
+      sha256 = "0khvf4kqf9i425fjczl1miqsz0pxbyryxy32bf9knr3k5kmwbn24";
+      name = "kmbox-16.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz";
-      sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400";
-      name = "kmime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmime-16.12.3.tar.xz";
+      sha256 = "0gzbh0g075ml5x0qy4zd1cg1qygdsnssl5ahk9pcgc0fik4p9j20";
+      name = "kmime-16.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz";
-      sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q";
-      name = "kmines-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmines-16.12.3.tar.xz";
+      sha256 = "0dz6yx7y0jpxhmyjrfyf6rrkiayn4mpyr4n1iszs11gac1bqppvn";
+      name = "kmines-16.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz";
-      sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz";
-      name = "kmix-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmix-16.12.3.tar.xz";
+      sha256 = "1mq4kna3z62269m43qy42knq4byrvirk0mk5yp56n51im1bmdyj4";
+      name = "kmix-16.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz";
-      sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i";
-      name = "kmousetool-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmousetool-16.12.3.tar.xz";
+      sha256 = "1678sjj96f22sn60ccyj6hqi2vghkf4facnx8l15x4xx05yq1vgg";
+      name = "kmousetool-16.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz";
-      sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg";
-      name = "kmouth-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmouth-16.12.3.tar.xz";
+      sha256 = "1afvjds1kfb8zvv3ma8c6svan6zlbd1w9a164vxwp7gl3ycjyj52";
+      name = "kmouth-16.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz";
-      sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3";
-      name = "kmplot-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmplot-16.12.3.tar.xz";
+      sha256 = "02vh4diqs4688p2xlia437jywx89yhpaf8ipprdq92q034glybyz";
+      name = "kmplot-16.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz";
-      sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn";
-      name = "knavalbattle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knavalbattle-16.12.3.tar.xz";
+      sha256 = "0164z9h1689bz600p17p8fq552g8pq73l81nj4f5csklhnsiykkg";
+      name = "knavalbattle-16.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz";
-      sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp";
-      name = "knetwalk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knetwalk-16.12.3.tar.xz";
+      sha256 = "1mavc0rn41y3vgzf0ikwvk3kh4fszylh7h4briw9k0kqx2cxh5vk";
+      name = "knetwalk-16.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz";
-      sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04";
-      name = "knotes-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knotes-16.12.3.tar.xz";
+      sha256 = "1yyx98zn7a3hbiyr16fcbylbm5v8lyg22v8gwf7xpnbx5jb4hpb8";
+      name = "knotes-16.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz";
-      sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx";
-      name = "kolf-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kolf-16.12.3.tar.xz";
+      sha256 = "136iyf8clr2r8qkjcm0nqcq0sjr5xry9gbxjhz128lc0nywsxpd5";
+      name = "kolf-16.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz";
-      sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c";
-      name = "kollision-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kollision-16.12.3.tar.xz";
+      sha256 = "0kwnqqm9gs6ac7ags9x82ykmp3vccp3kdd3js26a1kz1zkip32il";
+      name = "kollision-16.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz";
-      sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj";
-      name = "kolourpaint-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kolourpaint-16.12.3.tar.xz";
+      sha256 = "1yg3xnbbzvhcgb7i92bya41gq4z0135njcc77848khndpgkxvczb";
+      name = "kolourpaint-16.12.3.tar.xz";
     };
   };
   kommander = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz";
-      sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w";
-      name = "kommander-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kommander-16.12.3.tar.xz";
+      sha256 = "1wlks0alw82ra3g63d8k8nj9sq899hjv1r2kshk7c4vdk7arn1fg";
+      name = "kommander-16.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz";
-      sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6";
-      name = "kompare-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kompare-16.12.3.tar.xz";
+      sha256 = "18z6424xidpx5kmbjiasvhagh2b1a9pxizc0dsvba47v9xcavsaw";
+      name = "kompare-16.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz";
-      sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7";
-      name = "konqueror-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konqueror-16.12.3.tar.xz";
+      sha256 = "1pwv2mj9xrn6aymhkqmwd89d5i3v2jixp07dz0by62rcpfhm89p5";
+      name = "konqueror-16.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz";
-      sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi";
-      name = "konquest-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konquest-16.12.3.tar.xz";
+      sha256 = "1fhz9pwi2dmmcjg10vp36m8d759zikg6nqpjdp41dg95lkyf5vkf";
+      name = "konquest-16.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz";
-      sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676";
-      name = "konsole-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konsole-16.12.3.tar.xz";
+      sha256 = "10k7ryvsssbskpxk04iqx2mrp2a91291r8nzvg1780lrhql5rdj7";
+      name = "konsole-16.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz";
-      sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv";
-      name = "kontact-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kontact-16.12.3.tar.xz";
+      sha256 = "0wj4w9ak6dm330s393hjb79w16gs5kij5gz9swf3pxwg21xbd4ps";
+      name = "kontact-16.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz";
-      sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77";
-      name = "kontactinterface-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kontactinterface-16.12.3.tar.xz";
+      sha256 = "0n5hvx3xp01krwwd2szgh1s6nn5spfns1ivc36i1gdbhkf871k98";
+      name = "kontactinterface-16.12.3.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz";
-      sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib";
-      name = "kopete-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kopete-16.12.3.tar.xz";
+      sha256 = "1dkn4d13knf0lcj4241fmjcj51ypg9frzsf0pl02mr08rd2rxgk1";
+      name = "kopete-16.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz";
-      sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g";
-      name = "korganizer-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/korganizer-16.12.3.tar.xz";
+      sha256 = "1724l321gzjwha8yhrans4lhzs39fs98xi7wbd5msfflzyg3l6ga";
+      name = "korganizer-16.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz";
-      sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr";
-      name = "kpat-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kpat-16.12.3.tar.xz";
+      sha256 = "04qvv7q7rlsiyff2isy18h2fbz2lnljal5spq5qg9zl6v8hx6qzm";
+      name = "kpat-16.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz";
-      sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy";
-      name = "kpimtextedit-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kpimtextedit-16.12.3.tar.xz";
+      sha256 = "06iz9l8z708kdivzibqkgdrbvw7kfd2lr2grf3v9l6gfl3qs1kbw";
+      name = "kpimtextedit-16.12.3.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz";
-      sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n";
-      name = "kppp-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kppp-16.12.3.tar.xz";
+      sha256 = "0lqv95zfzcik8k95a39s6whjsnq6g15amnxlzy898liyxkr499bc";
+      name = "kppp-16.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz";
-      sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi";
-      name = "kqtquickcharts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kqtquickcharts-16.12.3.tar.xz";
+      sha256 = "1xzn9vxiqam8pk4zj8qcq55v9g52d9qkddbdv25pml8s0yhlsgqf";
+      name = "kqtquickcharts-16.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz";
-      sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf";
-      name = "krdc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/krdc-16.12.3.tar.xz";
+      sha256 = "0visx3371ym78n9aqkln2akvvf0rphyxg5hxvc2981pgpdry20zq";
+      name = "krdc-16.12.3.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz";
-      sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma";
-      name = "kremotecontrol-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kremotecontrol-16.12.3.tar.xz";
+      sha256 = "0xcs8gvb7ack0xqdp99x04lyv6hbqgxa5nq44pxl7czzc0la5nbk";
+      name = "kremotecontrol-16.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz";
-      sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df";
-      name = "kreversi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kreversi-16.12.3.tar.xz";
+      sha256 = "1qi6y263c8qp0bv9vmjk4rxq55mc0v1kn56yvivc5sfg9p4bqs9b";
+      name = "kreversi-16.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz";
-      sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy";
-      name = "krfb-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/krfb-16.12.3.tar.xz";
+      sha256 = "1ijz0zdlkxb9mldgd5a5k7aa2ikmmg023mafmxrjwymsig7ya4hv";
+      name = "krfb-16.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz";
-      sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad";
-      name = "kross-interpreters-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kross-interpreters-16.12.3.tar.xz";
+      sha256 = "0z1n42imbhsx0qmx479sklnihwvbd5l5pigbpbpm80rgwda2ib57";
+      name = "kross-interpreters-16.12.3.tar.xz";
     };
   };
   kruler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz";
-      sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp";
-      name = "kruler-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kruler-16.12.3.tar.xz";
+      sha256 = "08w7pb7wyaqnhwvqczxzbrbnm8930wzkl8y4lpimp5mqzb94i8qx";
+      name = "kruler-16.12.3.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz";
-      sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258";
-      name = "ksaneplugin-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksaneplugin-16.12.3.tar.xz";
+      sha256 = "1z0ziapcjmi7fqfnb0zsbjgd1q05np1s7smj1k8cd8c6f169yrld";
+      name = "ksaneplugin-16.12.3.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz";
-      sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0";
-      name = "kscd-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kscd-16.12.3.tar.xz";
+      sha256 = "1mpba78m4hs8541n4ydz7vswq1chi0fmmlfw2kqnrzarcandyga0";
+      name = "kscd-16.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz";
-      sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b";
-      name = "kshisen-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kshisen-16.12.3.tar.xz";
+      sha256 = "17szjblrp172rvyl98x5a0g9yg29b85bmwkzk7pqnjbn387kgy9r";
+      name = "kshisen-16.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz";
-      sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn";
-      name = "ksirk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksirk-16.12.3.tar.xz";
+      sha256 = "1akfskyfhffh71w2hknw9vvap2a2sq0irmkxij9xcdmlvpfwnkn5";
+      name = "ksirk-16.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz";
-      sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983";
-      name = "ksnakeduel-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksnakeduel-16.12.3.tar.xz";
+      sha256 = "1797kac3prchq5254dby41k04i8i7hgf2a9cb8s71n7hrsj62dyn";
+      name = "ksnakeduel-16.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz";
-      sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb";
-      name = "kspaceduel-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kspaceduel-16.12.3.tar.xz";
+      sha256 = "0ipx1sxhv207nlw7rcp7155l76z39x7j1b5y3qwxcgd7s69wb82k";
+      name = "kspaceduel-16.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz";
-      sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy";
-      name = "ksquares-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksquares-16.12.3.tar.xz";
+      sha256 = "0abd19hf1rvlzkxc4kvdljs5yk39pay81n3n9n0w6qyr764r4qn9";
+      name = "ksquares-16.12.3.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz";
-      sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp";
-      name = "kstars-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kstars-16.12.3.tar.xz";
+      sha256 = "0lcrn7r1nw85c0w6dg03mwf5lnsahmww60y6vwzfh2r53nbm9c1y";
+      name = "kstars-16.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz";
-      sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg";
-      name = "ksudoku-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksudoku-16.12.3.tar.xz";
+      sha256 = "00hi8x09fj5ahj0ah9rsci2dscrdl8x9mrlcacjrwgwm503y95gk";
+      name = "ksudoku-16.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz";
-      sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154";
-      name = "ksystemlog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksystemlog-16.12.3.tar.xz";
+      sha256 = "0xd6pp02k84a1r6gy10x0br33g4awpbhx45j7n69l1s96szj4aki";
+      name = "ksystemlog-16.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz";
-      sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613";
-      name = "kteatime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kteatime-16.12.3.tar.xz";
+      sha256 = "0wqzw9sa4zkgkwndvyas47x5wc4gcya3pmdcvg7wf7wl8j5k7vdy";
+      name = "kteatime-16.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz";
-      sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz";
-      name = "ktimer-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktimer-16.12.3.tar.xz";
+      sha256 = "0hpskwa8g88fz39b0y7sjl574s82d6smla1bhs8mdjlabv0sln6z";
+      name = "ktimer-16.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz";
-      sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg";
-      name = "ktnef-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktnef-16.12.3.tar.xz";
+      sha256 = "0v38h7bwjwab1656w3c2h1by5925f616idnvflgp123v1cs6jy1n";
+      name = "ktnef-16.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz";
-      sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1";
-      name = "ktouch-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktouch-16.12.3.tar.xz";
+      sha256 = "17gkvzczfgmip18y3jbjisz4z8m5hwbgkqn4qynabp6dqihwhzgg";
+      name = "ktouch-16.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz";
-      sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah";
-      name = "ktp-accounts-kcm-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-accounts-kcm-16.12.3.tar.xz";
+      sha256 = "0pr191i9fmz66wlv8krmy1pba7igd1qwa0akb4kdzkm4bx3z8wq3";
+      name = "ktp-accounts-kcm-16.12.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz";
-      sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j";
-      name = "ktp-approver-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-approver-16.12.3.tar.xz";
+      sha256 = "08aj2j9bjdyigl4cx65v5fjsdayid07mx0mq72iy6l17d8z4b39a";
+      name = "ktp-approver-16.12.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz";
-      sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl";
-      name = "ktp-auth-handler-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-auth-handler-16.12.3.tar.xz";
+      sha256 = "08ryqkba9zngjabsp1b9w13psp0n97qhjd31id007hc6r6s1nxxx";
+      name = "ktp-auth-handler-16.12.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz";
-      sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2";
-      name = "ktp-call-ui-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-call-ui-16.12.3.tar.xz";
+      sha256 = "1aq0s4v972kskjnq720364y971iyr0m6pj42fw5rpkl7j8vfg1rd";
+      name = "ktp-call-ui-16.12.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz";
-      sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6";
-      name = "ktp-common-internals-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-common-internals-16.12.3.tar.xz";
+      sha256 = "0g3vmds5f7wmffp9rv915bll8ky7qf3lz172ymc6q9i1xvghp215";
+      name = "ktp-common-internals-16.12.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz";
-      sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy";
-      name = "ktp-contact-list-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-list-16.12.3.tar.xz";
+      sha256 = "05asblclq6sjd3d9faaj2ya37srf4lhg8jx705aw13wd5d6pk75w";
+      name = "ktp-contact-list-16.12.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz";
-      sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g";
-      name = "ktp-contact-runner-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-runner-16.12.3.tar.xz";
+      sha256 = "1lcx9smfv2dqrwsbdd4srcq7dqap8bclz788p6jjn04xi6wcbbiq";
+      name = "ktp-contact-runner-16.12.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz";
-      sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv";
-      name = "ktp-desktop-applets-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-desktop-applets-16.12.3.tar.xz";
+      sha256 = "1pd8vzwmxcsw6pq80r9casi07wwisr70l5ffm231v9d73k4fw7kv";
+      name = "ktp-desktop-applets-16.12.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz";
-      sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363";
-      name = "ktp-filetransfer-handler-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-filetransfer-handler-16.12.3.tar.xz";
+      sha256 = "0ddmrpnh6myl7m3drh3cxx9pp06al98g8mppnysmgswgkwafg6cq";
+      name = "ktp-filetransfer-handler-16.12.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz";
-      sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9";
-      name = "ktp-kded-module-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-kded-module-16.12.3.tar.xz";
+      sha256 = "06zw8padspbn8ydcbs69v3ggmfpqrb3axxd2v1sgg4p4kdp0jyml";
+      name = "ktp-kded-module-16.12.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz";
-      sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0";
-      name = "ktp-send-file-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-send-file-16.12.3.tar.xz";
+      sha256 = "1m7cj3q4lzj8qj2cla6wm1crpjid77b3f3yywri167f1zd4p51z6";
+      name = "ktp-send-file-16.12.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz";
-      sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry";
-      name = "ktp-text-ui-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktp-text-ui-16.12.3.tar.xz";
+      sha256 = "0ssxr35vcqjppnppyjxwzrkzvb5sx45fpnvbzsv9md5rnlf2xh1k";
+      name = "ktp-text-ui-16.12.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz";
-      sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p";
-      name = "ktuberling-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktuberling-16.12.3.tar.xz";
+      sha256 = "1vn35bn0x5ykd9j78q5apg1i14v546jrqq1yn2q178d9qmx79pgv";
+      name = "ktuberling-16.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz";
-      sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq";
-      name = "kturtle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kturtle-16.12.3.tar.xz";
+      sha256 = "1mpdwb6999nar16mpha30cf4qzmpbsdha44aw77gn301v215rwj3";
+      name = "kturtle-16.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz";
-      sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl";
-      name = "kubrick-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kubrick-16.12.3.tar.xz";
+      sha256 = "1bwr8xi4d58k94h7lpl02iqf87nxhpls33ca654kzy353awqbp7f";
+      name = "kubrick-16.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz";
-      sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4";
-      name = "kwalletmanager-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwalletmanager-16.12.3.tar.xz";
+      sha256 = "07miaqr0yaqb0lkssb1jfg35cvr9svn16nhvb1zffvbf9fdlim47";
+      name = "kwalletmanager-16.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz";
-      sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij";
-      name = "kwave-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwave-16.12.3.tar.xz";
+      sha256 = "1s5zwhck204m5rkrpmbghzid3dpzhqbwsilb5pfh4128d04fx9ad";
+      name = "kwave-16.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz";
-      sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx";
-      name = "kwordquiz-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwordquiz-16.12.3.tar.xz";
+      sha256 = "1r8q2d6j7bq8jdr4cl9maapadzg7yp0zldjxkcqg08ldwsrrsnqj";
+      name = "kwordquiz-16.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz";
-      sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw";
-      name = "libgravatar-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libgravatar-16.12.3.tar.xz";
+      sha256 = "0m726ixss72rz3gwgn7q5s34xwbghi877y7gxa1ilcrk9rhyxv2f";
+      name = "libgravatar-16.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz";
-      sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82";
-      name = "libkcddb-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkcddb-16.12.3.tar.xz";
+      sha256 = "0iaascv9a5g8681mjc6b7f2fd8fdi9p3dx8l9lapkpzcygy1fwpc";
+      name = "libkcddb-16.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz";
-      sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va";
-      name = "libkcompactdisc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkcompactdisc-16.12.3.tar.xz";
+      sha256 = "021yws9854w6fwwfw31b87rpz92ach5xyq427968m3mc3c430d4l";
+      name = "libkcompactdisc-16.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz";
-      sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3";
-      name = "libkdcraw-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdcraw-16.12.3.tar.xz";
+      sha256 = "03ag6vzdj5n7zbb8yb9k84ckm1zwp2i9qqrsfn2mmmhypwknpg4w";
+      name = "libkdcraw-16.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz";
-      sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly";
-      name = "libkdegames-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdegames-16.12.3.tar.xz";
+      sha256 = "0w7q7x04imwrdfj5zwgv0y49k4wi7a6ghqipyc5qmrwfg9ya85b3";
+      name = "libkdegames-16.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz";
-      sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf";
-      name = "libkdepim-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdepim-16.12.3.tar.xz";
+      sha256 = "07afpxhvxpf50h10vg6vla543n4rvy1grldjj4aygwh1fgl5snm0";
+      name = "libkdepim-16.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz";
-      sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz";
-      name = "libkeduvocdocument-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkeduvocdocument-16.12.3.tar.xz";
+      sha256 = "05s79q269m5s78zjwxljxvprrqvpalf6h38n90m589vks82ahxx0";
+      name = "libkeduvocdocument-16.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz";
-      sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr";
-      name = "libkexiv2-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkexiv2-16.12.3.tar.xz";
+      sha256 = "02fr10prqmpaqqlcj8hf5h4b3vhhiwkfsbpzlag64n5764x1hl3f";
+      name = "libkexiv2-16.12.3.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz";
-      sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc";
-      name = "libkface-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkface-16.12.3.tar.xz";
+      sha256 = "068xixlw0hfhi3c9nxik2y6xyci1ilwwfq4sjm1paqfszp0f4rq8";
+      name = "libkface-16.12.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz";
-      sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q";
-      name = "libkgeomap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkgeomap-16.12.3.tar.xz";
+      sha256 = "1zz2w7cbabyrvzvw2ph38mxw7khyhjzg86na2lcywla7japlbsd9";
+      name = "libkgeomap-16.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz";
-      sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w";
-      name = "libkipi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkipi-16.12.3.tar.xz";
+      sha256 = "0f1m0v0cm11dqwm3n9w1mwz25sj3bggx19fi0jj4ij7zqicpykz6";
+      name = "libkipi-16.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz";
-      sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0";
-      name = "libkleo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkleo-16.12.3.tar.xz";
+      sha256 = "0rzp2bxqij9fkdsghskd2f05vgcybdc9l7wdrjqhhcngi8qxl0nn";
+      name = "libkleo-16.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz";
-      sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f";
-      name = "libkmahjongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkmahjongg-16.12.3.tar.xz";
+      sha256 = "0fhz7jp4wcvjcicyiwc4qq4vviwagfjdy6n5bhv7bmlccq4xfk5x";
+      name = "libkmahjongg-16.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz";
-      sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2";
-      name = "libkomparediff2-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkomparediff2-16.12.3.tar.xz";
+      sha256 = "1hm2d6217qwxsq6nyyh7iv573zkkmcn68x188zav48kmydj45l9i";
+      name = "libkomparediff2-16.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz";
-      sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885";
-      name = "libksane-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libksane-16.12.3.tar.xz";
+      sha256 = "0406jdzs193scmb8rkx2fqcr2a0svz53sf1av9qi2nq9dnil9hcq";
+      name = "libksane-16.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz";
-      sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v";
-      name = "libksieve-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libksieve-16.12.3.tar.xz";
+      sha256 = "1riqsfl3x4vpwqv7398gj86hnwfzqwfj7d69wsxk3r02jp3xd9i2";
+      name = "libksieve-16.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz";
-      sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk";
-      name = "lokalize-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/lokalize-16.12.3.tar.xz";
+      sha256 = "17ikk89680jjzv95gnrzah4bi3xnyp5mi64prhblhw7kz6vlf8x0";
+      name = "lokalize-16.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz";
-      sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w";
-      name = "lskat-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/lskat-16.12.3.tar.xz";
+      sha256 = "02mqb4c650ydy9qp3qg1avrj0m0a8yxmg0zw6hcv5pvckgfpcxki";
+      name = "lskat-16.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz";
-      sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0";
-      name = "mailcommon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/mailcommon-16.12.3.tar.xz";
+      sha256 = "1sx7dgy9jad6vqp1dljg9m40x57zz6xy9d2f1lgab5ibs1lrjhq5";
+      name = "mailcommon-16.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz";
-      sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q";
-      name = "mailimporter-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/mailimporter-16.12.3.tar.xz";
+      sha256 = "08yj4i6jy08hk62mxw299sh2n5pknzxanmzr96n6lf8g1jcf2l21";
+      name = "mailimporter-16.12.3.tar.xz";
     };
   };
   marble = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz";
-      sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0";
-      name = "marble-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/marble-16.12.3.tar.xz";
+      sha256 = "08dykrmiq1jk9yv83sjj6s3gps56bw0hxjbvb90bzd1g0kh0c82j";
+      name = "marble-16.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz";
-      sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060";
-      name = "mbox-importer-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/mbox-importer-16.12.3.tar.xz";
+      sha256 = "04sxijnyr13yjqkd1wm14bxm3k7r17dv24mfb3kbf804s7g8hvq7";
+      name = "mbox-importer-16.12.3.tar.xz";
     };
   };
   messagelib = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz";
-      sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88";
-      name = "messagelib-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/messagelib-16.12.3.tar.xz";
+      sha256 = "1s5r5w231lzy3csljd5qil54ibm9mjs7c9hbw1whqmn4kd0vaz15";
+      name = "messagelib-16.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz";
-      sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s";
-      name = "minuet-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/minuet-16.12.3.tar.xz";
+      sha256 = "15c0mw8qj7r6192h39lvsmiy3pqlfqzari4qjg2x44j5gq02ab3c";
+      name = "minuet-16.12.3.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz";
-      sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s";
-      name = "okteta-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/okteta-16.12.3.tar.xz";
+      sha256 = "14wmacbxc5kc3y5y5lsdxgsswi1jdvlxsd0xqcims50xjpb8znpd";
+      name = "okteta-16.12.3.tar.xz";
     };
   };
   okular = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz";
-      sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc";
-      name = "okular-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/okular-16.12.3.tar.xz";
+      sha256 = "1gilr9nviv51pcnmqdfw7834knvyfd11ggdjvinxvbpz61832niv";
+      name = "okular-16.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz";
-      sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9";
-      name = "palapeli-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/palapeli-16.12.3.tar.xz";
+      sha256 = "13s9ybj8a1f39z66syj88vx8rygdbb969b1d5r01msav3lk8ar3j";
+      name = "palapeli-16.12.3.tar.xz";
     };
   };
   parley = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz";
-      sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb";
-      name = "parley-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/parley-16.12.3.tar.xz";
+      sha256 = "0vmbn8188brp4bysyzmkgsa8nnn9zdqb7q6x3mi1xg7ralzfjw71";
+      name = "parley-16.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz";
-      sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c";
-      name = "picmi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/picmi-16.12.3.tar.xz";
+      sha256 = "0v44n05b6v46qmfrgq6b0q8bifnz5ax1f6sjrg6940q99kp2cxx4";
+      name = "picmi-16.12.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz";
-      sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m";
-      name = "pimcommon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/pimcommon-16.12.3.tar.xz";
+      sha256 = "179ig6rwxil1ssm7k2cy7ny3vf2dbhsjn39c0ic70r03q3lzbhll";
+      name = "pimcommon-16.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz";
-      sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m";
-      name = "pim-data-exporter-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/pim-data-exporter-16.12.3.tar.xz";
+      sha256 = "14xvh2gn3vc3i94fv96xbv7gxnwj8xxg3zkgfdlayajp3sz7c3yw";
+      name = "pim-data-exporter-16.12.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz";
-      sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85";
-      name = "pim-sieve-editor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/pim-sieve-editor-16.12.3.tar.xz";
+      sha256 = "03gnq2hlvw92gg8rf2bwrvf83nrgcvy6xanvwn3vcrqjfg55vb1k";
+      name = "pim-sieve-editor-16.12.3.tar.xz";
     };
   };
   pim-storage-service-manager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz";
-      sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9";
-      name = "pim-storage-service-manager-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/pim-storage-service-manager-16.12.3.tar.xz";
+      sha256 = "0ii1f5gv430i8h2c4xdy35rz7w9py53xans8zwgpj6ir6x6gfkb0";
+      name = "pim-storage-service-manager-16.12.3.tar.xz";
     };
   };
   poxml = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz";
-      sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0";
-      name = "poxml-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/poxml-16.12.3.tar.xz";
+      sha256 = "1cpc49hnslc2iabgnvda7967mmrdzykjydi8py67ycr9k1gx6pm5";
+      name = "poxml-16.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz";
-      sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw";
-      name = "print-manager-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/print-manager-16.12.3.tar.xz";
+      sha256 = "1mjzqq7yhm1s4jbr6nhy1i1lm27134j6g7b04mmzk3hbgd8lkr99";
+      name = "print-manager-16.12.3.tar.xz";
     };
   };
   rocs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz";
-      sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g";
-      name = "rocs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/rocs-16.12.3.tar.xz";
+      sha256 = "17iz9ql988mj1vsvywd8w5w7qmbncxal71maf3rldadwmadkvzbl";
+      name = "rocs-16.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz";
-      sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i";
-      name = "signon-kwallet-extension-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/signon-kwallet-extension-16.12.3.tar.xz";
+      sha256 = "0fnqdcin471hlw694vb6z9ybgw31778rhnryc7zps40kjwfdxhcc";
+      name = "signon-kwallet-extension-16.12.3.tar.xz";
     };
   };
   spectacle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz";
-      sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507";
-      name = "spectacle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/spectacle-16.12.3.tar.xz";
+      sha256 = "1fca71a59sgicq9zi8d0im0xpg7iz93s96h3clxxc6p493vsjkx6";
+      name = "spectacle-16.12.3.tar.xz";
     };
   };
   step = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz";
-      sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk";
-      name = "step-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/step-16.12.3.tar.xz";
+      sha256 = "0pyvhlfrklc2xxylb0nlnpqx5xi0pp4zyb3xbzj87wmvcw7v5n6r";
+      name = "step-16.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz";
-      sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g";
-      name = "svgpart-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/svgpart-16.12.3.tar.xz";
+      sha256 = "0frzqp504dzqwqs9lh544xxa8i6sqi6qj533mqbzkqbjx310ka3w";
+      name = "svgpart-16.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz";
-      sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4";
-      name = "sweeper-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/sweeper-16.12.3.tar.xz";
+      sha256 = "1vf4840l233gji4sjkg9gz2pr98kin5sz37kj645z75vikwmk3al";
+      name = "sweeper-16.12.3.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz";
-      sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp";
-      name = "syndication-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/syndication-16.12.3.tar.xz";
+      sha256 = "11qa0jya3fjvhwsq98aag92ha20y7x758fvc4xi3800rbj8nlc58";
+      name = "syndication-16.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz";
-      sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z";
-      name = "umbrello-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/umbrello-16.12.3.tar.xz";
+      sha256 = "1a4jhfmh2p1vsx8702ham550blkjj42ibwigcink6s9cadwk90cl";
+      name = "umbrello-16.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz";
-      sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss";
-      name = "zeroconf-ioslave-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/zeroconf-ioslave-16.12.3.tar.xz";
+      sha256 = "0p7kfx7bg3yvd44vg608s2znzfahkihan67zgyf3gmjllbzvp55b";
+      name = "zeroconf-ioslave-16.12.3.tar.xz";
     };
   };
 }

From bed935bd135215771a11e3b18ff658c5aa6ae521 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 13 Mar 2017 00:27:41 +0000
Subject: [PATCH 004/110] qmetro: init at 0.7.1

---
 pkgs/applications/misc/qmetro/default.nix | 32 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/misc/qmetro/default.nix

diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix
new file mode 100644
index 00000000000..932d8156a79
--- /dev/null
+++ b/pkgs/applications/misc/qmetro/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, qmake4Hook, unzip, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "${project}-${version}";
+  project = "qmetro";
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${project}/${name}.zip";
+    sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5";
+  };
+
+  nativeBuildInputs = [ qmake4Hook unzip ];
+
+  buildInputs = [ qt4 ];
+
+  postPatch = ''
+    sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop
+    echo 'LIBS += -lz' >> qmetro.pro
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/projects/qmetro/;
+    description = "Worldwide transit maps viewer";
+    license = licenses.gpl3;
+
+    maintainter = with maintainers; [ orivej ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9686b1c62d6..28fea813af7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14998,6 +14998,8 @@ with pkgs;
 
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
+  qmetro = callPackage ../applications/misc/qmetro { };
+
   qmidinet = callPackage ../applications/audio/qmidinet { };
 
   qmidiroute = callPackage ../applications/audio/qmidiroute { };

From 72619a86c9166d7b4bea5762070ee14fb72dc6e7 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 9 Mar 2017 21:02:16 +0100
Subject: [PATCH 005/110] JBoss AS: list known vulnerability

CVE-2015-7501

Warning in JBoss module
---
 nixos/modules/services/web-servers/jboss/default.nix | 2 +-
 pkgs/servers/http/jboss/default.nix                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 583fe56eb5e..d28724281a8 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -25,7 +25,7 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable jboss";
+        description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
       };
 
       tempDir = mkOption {
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 2dd9d544a03..068053d71f0 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -22,5 +22,8 @@ stdenv.mkDerivation {
     license = licenses.lgpl21;
     maintainers = [ maintainers.sander ];
     platforms = platforms.unix;
+    knownVulnerabilities = [
+      "CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation"
+    ];
   };
 }

From 68a1dc63042f2d70c0fc90bf4d22da45ec391d8b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:47:10 +0100
Subject: [PATCH 006/110] rustRegistry: 2017-02-19 -> 2017-03-13

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index faed3a218fc..1659208f76f 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-02-19";
-  rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1";
-  sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp";
+  version = "2017-03-13";
+  rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82";
+  sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb";
 
   src = fetchFromGitHub {
       inherit rev;

From 363cfbd23dd6653a12fd2a5deba97befe8816426 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:48:38 +0100
Subject: [PATCH 007/110] ripgrep: 0.4.0 -> 0.5.0

---
 pkgs/tools/text/ripgrep/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 7ba43e38f38..e0bd0d3711f 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
+    sha256 = "13mg624867hqxp9pzpq1gn9kqkvbaqcphdjia3bz5wvff1cbxkfy";
   };
 
-  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+  depsSha256 = "0glw8xk77w2h1xg6c451fg8cmwx3vz7dyzdrbf0i8d84yq8sh0i1";
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";

From 706bd194c7654bb0d5349305b5c9278748f794e0 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 13 Mar 2017 20:29:03 -0500
Subject: [PATCH 008/110] iso-codes: 3.56 -> 3.74

---
 .../libraries/iso-codes/default.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 9477aca5973..ed742888a0e 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,24 +1,24 @@
-{stdenv, fetchurl, gettext, python, xz}:
+{stdenv, fetchurl, gettext, python3, xz}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-3.56";
+  name = "iso-codes-3.74";
+
   src = fetchurl {
     url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz";
-    sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m";
+    sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11";
   };
   patchPhase = ''
     for i in `find . -name \*.py`
     do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+        sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i
     done
   '';
-  buildInputs = [ gettext ];
-  nativeBuildInputs = [ xz ];
+  buildInputs = [ gettext python3 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pkg-isocodes.alioth.debian.org/;
     description = "Various ISO codes packaged as XML files";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.all;
   };
 }

From 0c262a639e1f5754ebe0701b7f622e2ada26ddfa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:29 +0800
Subject: [PATCH 009/110] kmod-blacklist-ubuntu: 9.3 -> 22.1

---
 .../linux/kmod-blacklist-ubuntu/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index ca113114693..8154e37e3d5 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, gnugrep, findutils }:
+
 let
-  version = "3ubuntu1"; # Saucy
-in
-stdenv.mkDerivation {
+  version = "22-1.1ubuntu1"; # Zesty
+
+in stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
-    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
+    sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
   };
 
   installPhase = ''
@@ -25,9 +26,9 @@ stdenv.mkDerivation {
       --replace " xargs " " ${findutils}/bin/xargs "
   '';
 
-  meta = {
-    homepage = http://packages.ubuntu.com/source/saucy/kmod;
+  meta = with stdenv.lib; {
+    homepage = http://packages.ubuntu.com/source/zesty/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 605ee9e92b83554ef2e122c3ef254e4c3428cd00 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:44 +0800
Subject: [PATCH 010/110] kmod-blacklist-ubuntu: do not blacklist i2c_i801

---
 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 8154e37e3d5..c96d17b7a62 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -16,6 +16,8 @@ in stdenv.mkDerivation {
     for f in modprobe.d/*.conf; do
       echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
       cat "$f" >> "$out"/modprobe.conf
+      # https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945
+      sed -i '/^blacklist i2c_801/d' $out/modprobe.conf
     done
 
     substituteInPlace "$out"/modprobe.conf \

From 89724f152a9ab933142f07dc9da0eafb2a7f42a6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:55 +0800
Subject: [PATCH 011/110] kmod: 23 -> 24

---
 pkgs/os-specific/linux/kmod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 322df73e404..138130fa82e 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -6,11 +6,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "kmod-${version}";
-  version = "23";
+  version = "24";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk";
+    sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];

From aed491879588bb92bc6e5c264dd336a631d83903 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 14 Mar 2017 08:02:35 -0400
Subject: [PATCH 012/110] docker: 1.13.1 -> 17.03.0-ce

---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index f2db629336c..b8667997b16 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,14 +11,14 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.13.1";
-  rev = "092cba3"; # should match the version commit
+  version = "17.03.0-ce";
+  rev = "60ccb22"; # should match the version commit
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
+    sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9";
   };
 
   docker-runc = runc.overrideAttrs (oldAttrs: rec {
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "runc";
-      rev = "9df8b306d01f59d3a8029be411de015b7304dd8f";
-      sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9";
+      rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70";
+      sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1";
     };
     # docker/runc already include these patches / are not applicable
     patches = [];
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "containerd";
-      rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1";
-      sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c";
+      rev = "977c511eda0925a723debdc94d09459af49d082a";
+      sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc";
     };
   });
   docker-tini = tini.overrideAttrs  (oldAttrs: rec {

From dc32b87082d5295a2cf5393235f76f703d6a48ad Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Mar 2017 07:47:20 -0500
Subject: [PATCH 013/110] timewarrior: patch to install all themes; use default
 install target.

---
 .../applications/misc/timewarrior/default.nix |  6 +----
 .../misc/timewarrior/install-all-themes.patch | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/timewarrior/install-all-themes.patch

diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 091d51d3305..d417140b29b 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -13,11 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/{bin,share/man/man1}
-    cp -rv doc/man/*.1 $out/share/man/man1
-    cp src/timew $out/bin/
-  '';
+  patches = [ ./install-all-themes.patch ];
 
   meta = with stdenv.lib; {
     description = "A command-line time tracker";
diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch
new file mode 100644
index 00000000000..c6e8d3b0dbf
--- /dev/null
+++ b/pkgs/applications/misc/timewarrior/install-all-themes.patch
@@ -0,0 +1,27 @@
+From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 14 Mar 2017 07:51:02 -0500
+Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'.
+
+---
+ doc/themes/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt
+index a954576..3a3b453 100644
+--- a/doc/themes/CMakeLists.txt
++++ b/doc/themes/CMakeLists.txt
+@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8)
+ 
+ message ("-- Configuring theme documentation")
+ 
+-install (FILES README     DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES README           DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark.theme       DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_blue.theme  DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_red.theme   DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+-- 
+2.12.0
+

From 61f20c94ca8486071cfc1ed0216e7efa3a6079f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 15 Mar 2017 10:12:25 +0100
Subject: [PATCH 014/110] taskjuggler: remove 2.x series

The version was released 8 years ago and does not build anymore
---
 .../misc/taskjuggler/2.x/default.nix          | 76 -------------------
 .../misc/taskjuggler/2.x/timezone-glibc.patch | 48 ------------
 .../misc/taskjuggler/{3.x => }/Gemfile        |  0
 .../misc/taskjuggler/{3.x => }/Gemfile.lock   |  0
 .../misc/taskjuggler/{3.x => }/default.nix    |  0
 .../misc/taskjuggler/{3.x => }/gemset.nix     |  0
 pkgs/top-level/all-packages.nix               |  8 +-
 7 files changed, 2 insertions(+), 130 deletions(-)
 delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/default.nix
 delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
 rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile.lock (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/default.nix (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/gemset.nix (100%)

diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
deleted file mode 100644
index 2a199843cb3..00000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt3,
-libX11, libXext, libSM, libICE,
-}:
-
-stdenv.mkDerivation rec {
-  name = "taskjuggler-2.4.3";
-  src = fetchurl {
-    url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
-    sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
-  };
-
-  buildInputs =
-    [zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
-    ;
-
-  patches = [ ./timezone-glibc.patch ];
-
-  preConfigure = ''
-    for i in $(grep -R "/bin/bash" .  | sed 's/:.*//'); do
-      substituteInPlace $i --replace /bin/bash $(type -Pp bash)
-    done
-    for i in $(grep -R "/usr/bin/perl" .  | sed 's/:.*//'); do
-      substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
-    done
-
-    # Fix install
-    for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
-      # Do not use variable substitution because there is some text after the last '@'
-      substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
-    done
-
-    # Comment because the ical export need the KDE support.
-    for i in Examples/FirstProject/AccountingSoftware.tjp; do
-      substituteInPlace $i --replace "icalreport" "# icalreport"
-    done
-
-    for i in TestSuite/testdir TestSuite/createrefs \
-      TestSuite/Scheduler/Correct/Expression.sh; do
-      substituteInPlace $i --replace '/bin/rm' 'rm'
-    done
-
-    # Some tests require writing at $HOME
-    HOME=$TMPDIR
-  '';
-
-  configureFlags = "
-    --without-arts --disable-docs
-    --x-includes=${libX11.dev}/include
-    --x-libraries=${libX11.out}/lib
-    --with-qt-dir=${qt3}
-  ";
-
-  preInstall = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
-  '';
-
-  installFlags =
-    # kde_locale is not defined when installing without kde.
-    "kde_locale=\${out}/share/locale";
-
-  meta = {
-    homepage = "http://www.taskjuggler.org";
-    license = stdenv.lib.licenses.gpl2;
-    description = "Project management tool";
-    longDescription = ''
-      TaskJuggler is a modern and powerful, Open Source project management
-      tool. Its new approach to project planing and tracking is more
-      flexible and superior to the commonly used Gantt chart editing
-      tools. It has already been successfully used in many projects and
-      scales easily to projects with hundreds of resources and thousands of
-      tasks.
-    '';
-  };
-}
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
deleted file mode 100644
index f599e8a1730..00000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
-
-From: Chris Schlaeger <cs@kde.org>
-Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
-Subject: Try to fix time zone check for glibc 2.11.
-X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
-
-Try to fix time zone check for glibc 2.11.
-
-Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
----
-
-diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
-index 5e2bf21..9b7fce2 100644
---- a/taskjuggler/Utility.cpp
-+++ b/taskjuggler/Utility.cpp
-@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
- 
-     /* To validate the tZone value we call tzset(). It will convert the zone
-      * into a three-letter acronym in case the tZone value is good. If not, it
--     * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
--     * to UTC. */
-+     * will
-+     * - copy the wrong value to tzname[0] (glibc < 2.5)
-+     * - or fall back to UTC (glibc >= 2.5 && < 2.11)
-+     * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
-+     */
-     tzset();
-+    char* region = new(char[strlen(tZone) + 1]);
-+    region[0] = 0;
-+    if (strchr(tZone, '/'))
-+    {
-+        strcpy(region, tZone);
-+        *strchr(region, '/') = 0;
-+    }
-     if (timezone2tz(tZone) == 0 &&
--        (strcmp(tzname[0], tZone) == 0 ||
-+        (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
-          (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
-     {
-         UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
-+        delete region;
-         return false;
-     }
-+    delete region;
- 
-     if (!LtHashTab)
-         return true;
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile
rename to pkgs/applications/misc/taskjuggler/Gemfile
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
rename to pkgs/applications/misc/taskjuggler/Gemfile.lock
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/default.nix
rename to pkgs/applications/misc/taskjuggler/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/gemset.nix
rename to pkgs/applications/misc/taskjuggler/gemset.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a35800184a5..33459eb3ea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4628,7 +4628,7 @@ with pkgs;
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
-  
+
   yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };
@@ -15486,11 +15486,7 @@ with pkgs;
   teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
-  taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { };
-
-  taskjuggler = callPackage ../applications/misc/taskjuggler/3.x {
-    ruby = ruby_2_0;
-  };
+  taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; };
 
   tasknc = callPackage ../applications/misc/tasknc { };
 

From e7dca2c2309389699d510f7df4183331d827ea4c Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@my.jcu.edu.au>
Date: Wed, 15 Mar 2017 22:41:20 +1000
Subject: [PATCH 015/110] ITK build on darwin

---
 pkgs/development/libraries/itk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index ae1f9996b78..fab14e5d8b3 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.itk.org/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 8d83fbe439c2a497acbfa67fd5c1758bf79f6136 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Wed, 15 Mar 2017 18:55:03 +0545
Subject: [PATCH 016/110] nomad: 0.5.4 -> 0.5.5

---
 pkgs/applications/networking/cluster/nomad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ae3415adef9..1d39534bc16 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.5.4";
+  version = "0.5.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3";
+    sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65";
   };
 
   meta = with stdenv.lib; {

From d16b08ac85128c2a74cf21463987f4bab0f1dcab Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 15 Mar 2017 16:08:50 +0100
Subject: [PATCH 017/110] go2nix: 1.1.1 -> 1.2.0

---
 pkgs/development/tools/go2nix/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 5a77ec7eaa6..a6f5d62e29e 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "go2nix-${version}";
-  version = "1.1.1";
+  version = "1.2.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/kamilchm/go2nix";
@@ -12,11 +12,13 @@ buildGoPackage rec {
     inherit rev;
     owner = "kamilchm";
     repo = "go2nix";
-    sha256 = "1idxgn9yf8shw4mq4d7rhf8fvb2s1lli4r4ck0h8ddf1s9q8p63s";
+    sha256 = "1hlanw56r1phj89sicpsfcz6sdjba9qjwhiblcsqka4wfqkai8pn";
   };
 
   goDeps = ./deps.nix;
 
+  outputs = [ "bin" "out" "man" ];
+
   buildInputs = [ go-bindata goimports makeWrapper ];
   preBuild = ''go generate ./...'';
 
@@ -24,6 +26,9 @@ buildGoPackage rec {
     wrapProgram $bin/bin/go2nix \
       --prefix PATH : ${nix-prefetch-git}/bin \
       --prefix PATH : ${git}/bin
+
+    mkdir -p $man/share/man/man1
+    cp $src/go2nix.1 $man/share/man/man1
   '';
 
   allowGoReference = true;

From 14a3412048473e022e4bc2c687c66bb5f30c0e42 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Mar 2017 16:49:08 +0100
Subject: [PATCH 018/110] nixos: tests: firefox: make more comprehensive

Run Firefox inside an XTerm, it doesn't crash mysteriously this way.
Also try opening developer tools and checking that Firefox doesn't
crash in the process.
---
 nixos/tests/firefox.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 1bdabe93fec..e1b628c9144 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -8,15 +8,21 @@ import ./make-test.nix ({ pkgs, ... }: {
     { config, pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      environment.systemPackages = [ pkgs.firefox ];
+      environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
     };
 
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &");
+      $machine->execute("xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &");
       $machine->waitForWindow(qr/Valgrind/);
       $machine->sleep(40); # wait until Firefox has finished loading the page
+      $machine->execute("xdotool key space"); # do I want to make Firefox the
+                             # default browser? I just want to close the dialog
+      $machine->sleep(2); # wait until Firefox hides the default browser window
+      $machine->execute("xdotool key F12");
+      $machine->sleep(10); # wait until Firefox draws the developer tool panel
+      $machine->succeed("xwininfo -root -tree | grep Valgrind");
       $machine->screenshot("screen");
     '';
 

From 12648a455bd9d7755b635f0732ce402590e1bd6f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 20:02:29 +0100
Subject: [PATCH 019/110] linux_4_9: 4.9.14 -> 4.9.15

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 2327c882f2d..18ac6b41c8c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.14";
+  version = "4.9.15";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h5nnf9h00fsd7q66rapvwmfxs4pi0vjljk92ir5vid59hzk8kak";
+    sha256 = "14sfacaqkk9c66zrl8wkmy5331hczgz5j65yms6pnpwwi82sq3c2";
   };
 
   kernelPatches = args.kernelPatches;

From 331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:32 -0400
Subject: [PATCH 020/110] go1.4: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.4.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b703a92f3ea..f60077e8962 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross
+{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
 , pkgconfig
 , pcre
 , Security }:
@@ -114,6 +114,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.4.patch
     ./creds-test-1.4.patch
+
+    # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+    # actually works on old versions too.
+    (fetchpatch {
+      url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+      sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+    })
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From 08314598bb938682049fc5753da13648141c0230 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:39 -0400
Subject: [PATCH 021/110] go1.6: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.6.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 7d78f5efd10..52ffbab6dcb 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -113,6 +113,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.5.patch
     ./creds-test.patch
+
+    # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+    # actually works on old versions too.
+    (fetchpatch {
+      url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+      sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+    })
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:45 -0400
Subject: [PATCH 022/110] go1.7: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.7.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 0df2e8d6f7e..7fa35e1fcac 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -107,6 +107,13 @@ stdenv.mkDerivation rec {
     [ ./remove-tools-1.7.patch
       ./cacert-1.7.patch
       ./creds-test.patch
+
+      # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+      # actually works on old versions too.
+      (fetchpatch {
+        url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+        sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+      })
     ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 2ffda66f11bfd7f12271ac44ac7010148f73a085 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:59 -0400
Subject: [PATCH 023/110] go1.8: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.8.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 00ec11abc47..6d9ee3de550 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -80,11 +80,6 @@ stdenv.mkDerivation rec {
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
   '' + optionalString stdenv.isDarwin ''
-
-    # Disabling `format_test.go` because it fails on Darwin for an
-    # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727
-    rm src/time/format_test.go
-
     substituteInPlace src/race.bash --replace \
       "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
     sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
@@ -115,6 +110,13 @@ stdenv.mkDerivation rec {
       ./cacert-1.8.patch
       ./creds-test.patch
       ./remove-test-pie-1.8.patch
+
+      # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+      # works fine here for now.
+      (fetchpatch {
+        url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+        sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+      })
     ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 77b7b7df33e05d5cf238b0e0a0fd73b7c48d27fa Mon Sep 17 00:00:00 2001
From: edanaher <github@edanaher.net>
Date: Wed, 15 Mar 2017 16:20:25 -0400
Subject: [PATCH 024/110] bup: 0.28.1 -> 0.29 (#23876)

---
 pkgs/tools/backup/bup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 4e035ab67ac..baf9e4f4e39 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.28.1"; in
+let version = "0.29"; in
 
 with stdenv.lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l";
+    sha256 = "1cc9kpq9bpln89m4ni6wqzh4c8zwxmgnhaibdxxfs5pk2mpl3ds5";
   };
 
   buildInputs = [ git python2Packages.python ];

From 376d960034d90c33b9a59db168151b18ccb8bdc5 Mon Sep 17 00:00:00 2001
From: Andrzej Trzaska <atrzaska2@gmail.com>
Date: Wed, 15 Mar 2017 21:34:35 +0100
Subject: [PATCH 025/110] bundler: 1.14.4 -> 1.14.6 (#23930)

---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index f3737afdb22..9251c4d2a41 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.14.4";
-  sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv";
+  version = "1.14.6";
+  sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
   dontPatchShebangs = true;
 
   postFixup = ''

From 0cfa1b0ddeb5fb4083eea532ea9eccfbc4ad9d98 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 16:37:48 -0400
Subject: [PATCH 026/110] openjdk-darwin: use a sensible crypto policy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We should really move to a source build of openjdk on Darwin, but that's
tricky so for now we continue to hack around it and do stuff like this,
even though crypto export polices are stupid and make no sense. No, I'm
not bitter at all that I need to do this 😩
---
 pkgs/development/compilers/openjdk-darwin/8.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 1d12d59998a..2f3391f70e0 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -1,10 +1,16 @@
 { stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
+  jce-policies = fetchurl {
+    # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
+    url    = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
+    sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
+  };
+
   jdk = stdenv.mkDerivation {
     name = "zulu1.8.0_66-8.11.0.1";
 
     src = fetchurl {
-      url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip;
+      url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip";
       sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
     };
@@ -15,6 +21,9 @@ let
       mkdir -p $out
       mv * $out
 
+      unzip ${jce-policies}
+      mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/
+
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
     '';

From 18a272ef756ee6901cce4726e97a9ddb495b15ad Mon Sep 17 00:00:00 2001
From: Sergii Paryzhskyi <parizhskiy@gmail.com>
Date: Wed, 15 Mar 2017 22:17:23 +0100
Subject: [PATCH 027/110] sbt-0.12.4: add an older stable version (#23933)

---
 lib/maintainers.nix                           |  1 +
 .../tools/build-managers/sbt/0.12.4.nix       | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/build-managers/sbt/0.12.4.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e7b8ff7bf10..a44f93e36cf 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -204,6 +204,7 @@
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   hce = "Hans-Christian Esperer <hc@hcesperer.org>";
+  heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
diff --git a/pkgs/development/tools/build-managers/sbt/0.12.4.nix b/pkgs/development/tools/build-managers/sbt/0.12.4.nix
new file mode 100644
index 00000000000..9c02fcd0b3f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/sbt/0.12.4.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, jre }:
+
+stdenv.mkDerivation rec {
+  name = "sbt-${version}";
+  version = "0.12.14";
+
+  src = fetchurl {
+    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
+    sha256 = "5907af5a3db5e9090024c91e8b6189cd2143841b08c4688542a2efbc9023ac1a";
+  };
+
+  patchPhase = ''
+    echo -java-home ${jre.home} >>conf/sbtopts
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/sbt $out/bin
+    cp -ra . $out/share/sbt
+    ln -s $out/share/sbt/bin/sbt $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.scala-sbt.org/;
+    license = licenses.bsd3;
+    description = "A build tool for Scala, Java and more";
+    maintainers = with maintainers; [ heel ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f55fc5f54a6..b18c0e7f137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4634,7 +4634,7 @@ with pkgs;
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
-  
+
   yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };
@@ -6765,6 +6765,7 @@ with pkgs;
 
   scons = callPackage ../development/tools/build-managers/scons { };
 
+  sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { };
   sbt = callPackage ../development/tools/build-managers/sbt { };
   simpleBuildTool = sbt;
 

From eba3900781ef0abd0a8eb478820280851d1e0fbb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Mar 2017 20:04:40 +0000
Subject: [PATCH 028/110] ocamlPackages.rresult: init at 0.5.0

Rresult is an OCaml module for handling computation results and errors in an
explicit and declarative manner without resorting to exceptions.

Homepage: http://erratique.ch/software/rresult
---
 .../ocaml-modules/rresult/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/rresult/default.nix

diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
new file mode 100644
index 00000000000..f9951b56da2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-rresult-${version}";
+	version = "0.5.0";
+	src = fetchurl {
+		url = "http://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+		sha256 = "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		license = stdenv.lib.licenses.isc;
+		homepage = http://erratique.ch/software/rresult;
+		description = "Result value combinators for OCaml";
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2a59dbd3293..aeef0a2859b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -494,6 +494,8 @@ let
 
     re = callPackage ../development/ocaml-modules/re { };
 
+    rresult = callPackage ../development/ocaml-modules/rresult { };
+
     safepass = callPackage ../development/ocaml-modules/safepass { };
 
     sedlex = callPackage ../development/ocaml-modules/sedlex { };

From a1ea2879f82f5836948cd65d3e37d0c3c71a2055 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 16:35:49 -0500
Subject: [PATCH 029/110] libdiscid: 0.6.1 -> 0.6.2

---
 pkgs/development/libraries/libdiscid/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index d0122d0283c..c5da3816c41 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libdiscid-0.6.1";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake ];
+  name = "libdiscid-${version}";
+  version = "0.6.2";
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+  
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
-    sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc";
+    sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
   meta = with stdenv.lib; {

From 3c57a37c55f35bbd9107c072e052781869f138fc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 15 Mar 2017 23:44:25 +0200
Subject: [PATCH 030/110] sbt_0_12_4: Fix eval

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b18c0e7f137..b36db750d62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6765,8 +6765,8 @@ with pkgs;
 
   scons = callPackage ../development/tools/build-managers/scons { };
 
-  sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { };
   sbt = callPackage ../development/tools/build-managers/sbt { };
+  sbt_0_12_4 = callPackage ../development/tools/build-managers/sbt/0.12.4.nix { };
   simpleBuildTool = sbt;
 
   shards = callPackage ../development/tools/build-managers/shards { };

From ef56873e981bf919046c210f8ae44254885409ee Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 15 Mar 2017 10:33:32 +0800
Subject: [PATCH 031/110] emem: 0.2.35 -> 0.2.39

---
 pkgs/applications/misc/emem/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 76f2f03d159..3b0ac2e54c8 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.35";
+  version = "0.2.39";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0y1jwfmqmmff3kh82j07p9j0l2hc7dxhy8vij4lz8wrv6pnxng7f";
+    sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p";
   };
 
   buildInputs = [ ];
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/java
+    mkdir -p $out/bin $out/share/java
   '';
 
   installPhase = ''

From 545e267adfc796bcceeb5c6702075fb2890cabe2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Mar 2017 00:53:32 +0300
Subject: [PATCH 032/110] wireshark-gtk: wrap properly

---
 .../networking/sniffers/wireshark/default.nix      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index fd709aa7660..375a948c1f2 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
 , libssh, zlib, cmake, extra-cmake-modules
-, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:
@@ -23,11 +23,15 @@ in stdenv.mkDerivation {
     sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
   };
 
+  nativeBuildInputs = [
+    bison cmake extra-cmake-modules flex
+  ] ++ optional withGtk wrapGAppsHook;
+
   buildInputs = [
-    bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
-    geoip c-ares python glib zlib
-  ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
-    ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+    gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+    libgpgerror gnutls geoip c-ares python glib zlib
+  ] ++ optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
+    ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 

From cfc7a1877a1ff969e6d1dd18af74b467c3c6b5df Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Thu, 9 Mar 2017 14:35:37 -0500
Subject: [PATCH 033/110] clips: init at 6.30

CLIPS is a language for building expert systems.
---
 .../interpreters/clips/default.nix            | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/interpreters/clips/default.nix

diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
new file mode 100644
index 00000000000..cf923d40917
--- /dev/null
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "6.30";
+  name = "clips-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
+    sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
+  };
+  buildPhase = ''
+    make -C core -f ../makefiles/makefile.gcc
+  '';
+  installPhase = ''
+    install -D -t $out/bin core/clips
+  '';
+  meta = with stdenv.lib; {
+    description = "A Tool for Building Expert Systems";
+    homepage = "http://www.clipsrules.net/";
+    longDescription = ''
+      Developed at NASA's Johnson Space Center from 1985 to 1996,
+      CLIPS is a rule-based programming language useful for creating
+      expert systems and other programs where a heuristic solution is
+      easier to implement and maintain than an algorithmic solution.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [maintainers.league];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b36db750d62..2f0ffdd7de2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,6 +5656,8 @@ with pkgs;
 
   ceptre = callPackage ../development/interpreters/ceptre { };
 
+  clips = callPackage ../development/interpreters/clips { };
+
   clisp = callPackage ../development/interpreters/clisp { };
   clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
 

From a8f269d014dde1eb60d81d0153602a204f95ff28 Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Thu, 9 Mar 2017 23:09:06 +0100
Subject: [PATCH 034/110] gitkraken: 2.1.0 -> 2.2.0

also added myself as a maintainer
---
 pkgs/applications/version-management/gitkraken/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 70ca7a74b23..28d89fb32d0 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
-    sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999";
+    sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d";
   };
 
   libPath = stdenv.lib.makeLibraryPath [
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ xnwdd ];
   };
 }

From 9b0a175af9639b062fdbd7fcf6b00d38db81b902 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 16 Mar 2017 06:52:19 +0800
Subject: [PATCH 035/110] emem: 0.2.40 -> 0.2.41

---
 pkgs/applications/misc/emem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 3b0ac2e54c8..f748318407a 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.39";
+  version = "0.2.41";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p";
+    sha256 = "0pg7m4fyrcbm8d5nj96xvvh1cvml501rw34hniqq384waifr2kqs";
   };
 
   buildInputs = [ ];

From a89e9e999b7d88f3e08e4c70cb31beac712068ba Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 18:19:11 -0500
Subject: [PATCH 036/110] libextractor: 1.2 -> 1.3

---
 pkgs/development/libraries/libextractor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 6f1981d0ece..0f21180f691 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.2";
+  name = "libextractor-1.3";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96";
+    sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6";
   };
 
   preConfigure =

From 00addcb95e67ea9e6c2a6429216233a9fa96b45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:43:58 +0100
Subject: [PATCH 037/110] pythonPackages.python-jose: init at 1.3.2

---
 .../python-modules/python-jose/default.nix    | 29 +++++++++++++++
 .../python-jose/pycryptodome.patch            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/python-jose/default.nix
 create mode 100644 pkgs/development/python-modules/python-jose/pycryptodome.patch

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
new file mode 100644
index 00000000000..da4dd410746
--- /dev/null
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, future, six, ecdsa, pycryptodome, pytest
+}:
+
+buildPythonPackage rec {
+  name = "python-jose-${version}";
+  version = "1.3.2";
+  src = fetchFromGitHub {
+    owner = "mpdavis";
+    repo = "python-jose";
+    rev = version;
+    sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv";
+  };
+
+  buildInputs = [ pytest ];
+  checkPhase = "py.test .";
+  patches = [
+    # to use pycryptodme instead of pycrypto
+    ./pycryptodome.patch
+  ];
+  propagatedBuildInputs = [ future six ecdsa pycryptodome ];
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mpdavis/python-jose";
+    description = "A JOSE implementation in Python";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = [ maintainers.jhhuh ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch
new file mode 100644
index 00000000000..665ad598034
--- /dev/null
+++ b/pkgs/development/python-modules/python-jose/pycryptodome.patch
@@ -0,0 +1,37 @@
+diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt
+--- python-jose-1.3.2/requirements.txt	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/requirements.txt	2017-03-15 11:35:47.118001810 +0100
+@@ -1,3 +1,3 @@
+-pycrypto
++pycryptodome
+ six
+ future
+diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py
+--- python-jose-1.3.2/setup.py	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/setup.py	2017-03-15 11:37:15.725077184 +0100
+@@ -25,12 +25,8 @@
+ 
+ 
+ def get_install_requires():
+-    if platform.python_implementation() == 'PyPy':
+-        crypto_lib = 'pycryptodome >=3.3.1, <3.4.0'
+-    else:
+-        crypto_lib = 'pycrypto >=2.6.0, <2.7.0'
+     return [
+-        crypto_lib,
++        'pycryptodome >=3.3.1, <3.5.0',
+         'six <2.0',
+         'ecdsa <1.0',
+         'future <1.0',
+diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini
+--- python-jose-1.3.2/tox.ini	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/tox.ini	2017-03-15 11:36:50.423055657 +0100
+@@ -6,7 +6,7 @@
+     py.test --cov-report term-missing --cov jose
+ deps =
+     future
+-    pycrypto
++    pycryptodome
+     ecdsa
+     pytest
+     pytest-cov
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a797ea509..9be1e5d38ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5063,6 +5063,8 @@ in {
     };
   };
 
+  python-jose = callPackage ../development/python-modules/python-jose {};
+
   pyhepmc = buildPythonPackage rec {
     name = "pyhepmc-${version}";
     version = "0.5.0";
@@ -19725,7 +19727,6 @@ in {
     };
   };
 
-
   Babel = buildPythonPackage (rec {
     name = "Babel-2.3.4";
 

From 09cfbc8cc33bb00c14bede0ee8f941200d0c69be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:48:34 +0100
Subject: [PATCH 038/110] PyGithub: init at 1.32

---
 .../python-modules/pyGithub/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyGithub/default.nix

diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
new file mode 100644
index 00000000000..75fb75f9318
--- /dev/null
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub
+, cacert
+, buildPythonPackage, python-jose }:
+
+buildPythonPackage rec {
+  name = "PyGithub-${version}";
+  version = "1.32";
+
+  src = fetchFromGitHub {
+    owner = "PyGithub";
+    repo = "PyGithub";
+    rev = "v${version}";
+    sha256 = "15dr9ja63zdxax9lg6q2kcakqa82dpffyhgpjr13wq3sfkcy5pdw";
+  };
+
+  postPatch = ''
+    # requires network
+    echo "" > github/tests/Issue142.py
+  '';
+  propagatedBuildInputs = [ python-jose ];
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/PyGithub/PyGithub";
+    description = "A Python (2 and 3) library to access the GitHub API v3";
+    platforms = platforms.all;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9be1e5d38ab..8f7fe7a872e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20339,6 +20339,8 @@ in {
     };
   };
 
+  PyGithub = callPackage ../development/python-modules/pyGithub {};
+
   pyglet = buildPythonPackage rec {
     name = "pyglet-${version}";
     version = "1.2.4";

From 26045faaaf3d6893518b329de1b8cb0c2f2673e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:57:09 +0100
Subject: [PATCH 039/110] cligh: init at 0.3

fixes #23914
---
 .../tools/github/cligh/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/github/cligh/default.nix

diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
new file mode 100644
index 00000000000..09df42b2a45
--- /dev/null
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+buildPythonApplication rec {
+  name = "cligh-${version}";
+  version = "0.3";
+
+  doCheck = false; # no tests
+
+  src = fetchFromGitHub {
+    owner = "CMB";
+    repo = "cligh";
+    rev = "v${version}";
+    sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://the-brannons.com/software/cligh.html";
+    description = "A simple command-line interface to the facilities of Github";
+    longDescription = ''
+        Cligh is a simple command-line interface to the facilities of GitHub.
+        It is written by Christopher Brannon chris@the-brannons.com. The
+        current version is 0.3, released July 23, 2016. This program is still
+        in the early stage of development. It is by no means feature-complete.
+        A friend and I consider it useful, but others may not.
+    '';
+    platforms = platforms.all;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f0ffdd7de2..7e87d92ec3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12960,6 +12960,8 @@ with pkgs;
 
   clfswm = callPackage ../applications/window-managers/clfswm { };
 
+  cligh = callPackage ../development/tools/github/cligh {};
+
   clipgrab = callPackage ../applications/video/clipgrab { };
 
   clipit = callPackage ../applications/misc/clipit { };

From bf5dc90f304b6dd047a031cd097ada3bc242b7e0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 09:59:08 +0800
Subject: [PATCH 040/110] keybase: 20170209 -> 1.0.20

---
 pkgs/tools/security/keybase/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index b962a6409b4..5d212c0b80f 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "20170209.17b641d";
+  version = "1.0.20";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -10,10 +10,10 @@ buildGoPackage rec {
   dontRenameImports = true;
 
   src = fetchFromGitHub {
-    owner = "keybase";
-    repo = "client";
-    rev = "17b641de629a85ad77621d0efa3e2442661b5ee7";
-    sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11";
+    owner  = "keybase";
+    repo   = "client";
+    rev    = "v${version}";
+    sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v";
   };
 
   buildFlags = [ "-tags production" ];

From e3abe9c6faf2b65717867a3ec966667d9e83bfa7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 22:20:17 -0400
Subject: [PATCH 041/110] pythonPackages.pants13-pre: init

---
 pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f7fe7a872e..2c71d0dfa17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8562,9 +8562,44 @@ in {
 
     meta = {
       description = "A build system for software projects in a variety of languages";
-      homepage = "http://www.pantsbuild.org/";
-      license = licenses.asl20;
+      homepage    = "http://www.pantsbuild.org/";
+      license     = licenses.asl20;
       maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.unix;
+    };
+  };
+
+  pants13-pre = buildPythonPackage rec {
+    pname   = "pantsbuild.pants";
+    version = "1.3.0.dev13";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "0gnz0f74s53xccfdn78v2dg1m3gx2mm0pdmmjvs5ikfbb9lidhz4";
+    };
+
+    prePatch = ''
+      sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
+    '';
+
+    # Unnecessary, and causes some really weird behavior around .class files, which
+    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
+    dontStrip = true;
+
+    propagatedBuildInputs = with self; [
+      twitter-common-collections setproctitle setuptools six ansicolors
+      packaging pathspec scandir twitter-common-dirutil psutil requests2
+      pystache pex docutils markdown pygments twitter-common-confluence
+      fasteners coverage pywatchman futures cffi
+    ];
+
+    meta = {
+      description = "A build system for software projects in a variety of languages";
+      homepage    = "http://www.pantsbuild.org/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.unix;
     };
   };
 

From f60fec99d19f0f2181661d65f73aca3a85ca81c4 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Wed, 8 Mar 2017 04:45:22 -0800
Subject: [PATCH 042/110] SDL2_mixer: add optional fluidsynth support

also add flac support and mp3 support, and add myself as the maintainer,
since there is no current maintainer for this package
---
 pkgs/development/libraries/SDL2_mixer/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 0919970543c..9fef76c799b 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }:
+{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }:
 
 stdenv.mkDerivation rec {
   name = "SDL2_mixer-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
   };
 
-  propagatedBuildInputs = [ SDL2 libogg libvorbis ];
+  propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ];
 
   configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
 
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "SDL multi-channel audio mixer library";
     platforms = platforms.linux;
     homepage = "https://www.libsdl.org/projects/SDL_mixer/";
+    maintainers = with maintainers; [ MP2E ];
     license = licenses.zlib;
   };
 }

From 49c18cc75d394c57acffa594b170d36014a88b3a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Mar 2017 07:11:33 +0000
Subject: [PATCH 043/110] ocamlPackages.bos: init at 0.1.4

Bos provides support for basic and robust interaction
with the operating system in OCaml.

Homepage: http://erratique.ch/software/bos
---
 .../development/ocaml-modules/bos/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bos/default.nix

diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
new file mode 100644
index 00000000000..eb1e8d15fea
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, astring, fmt, fpath, logs, rresult
+}:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-bos-${version}";
+	version = "0.1.4";
+	src = fetchurl {
+		url = "http://erratique.ch/software/bos/releases/bos-${version}.tbz";
+		sha256 = "1ly66lysk4w6mdy4k1n3ynlpfpq7lw4wshcpzgx58v6x613w5s7q";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	propagatedBuildInputs = [ astring fmt fpath logs rresult ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "Basic OS interaction for OCaml";
+		homepage = http://erratique.ch/software/bos;
+		license = stdenv.lib.licenses.isc;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index aeef0a2859b..43cd2e22e4e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -53,6 +53,8 @@ let
 
     bolt = callPackage ../development/ocaml-modules/bolt { };
 
+    bos = callPackage ../development/ocaml-modules/bos { };
+
     bitstring =
       if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/bitstring { }

From 1ae9a7911ca7ca06be7d776621acd253f6c816b2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Thu, 16 Mar 2017 11:06:30 +0100
Subject: [PATCH 044/110] cligh: fix evaluation

---
 pkgs/development/tools/github/cligh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 09df42b2a45..ded0aaa9242 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "cligh-${version}";
   version = "0.3";
 

From aca073eb3a701358c5f75d9d2a502942a5eea781 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 18:09:13 +0800
Subject: [PATCH 045/110] pytest-catchlog: init at 1.2.2

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c71d0dfa17..3f13e9abedd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5140,6 +5140,24 @@ in {
     };
   };
 
+  pytest-catchlog = buildPythonPackage rec {
+    name = "pytest-catchlog-1.2.2";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pytest-catchlog/${name}.zip";
+      sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab";
+    };
+
+    buildInputs = with self; [ pytest ];
+
+    checkPhase = "make test";
+
+    meta = {
+      license = licenses.mit;
+      website = https://pypi.python.org/pypi/pytest-catchlog/;
+      description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog.";
+    };
+  };
+
   pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
 
   pytest-fixture-config = buildPythonPackage rec {

From 99c7aa45e762e4ef9a56a11ab10e961ec8874aff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 18:12:19 +0800
Subject: [PATCH 046/110] s3ql: 2.17.1 -> 2.21

---
 pkgs/tools/backup/s3ql/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 9b2adc1d39f..a90738d39a4 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -1,17 +1,29 @@
-{ stdenv, fetchurl, python3Packages, sqlite  }:
+{ stdenv, fetchurl, python3Packages, sqlite, which }:
 
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.17.1";
+  version = "2.21";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx";
+    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
   };
 
-  propagatedBuildInputs = with python3Packages;
-    [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ];
+  buildInputs = [ which ]; # tests will fail without which
+  propagatedBuildInputs = with python3Packages; [
+    sqlite apsw pycrypto requests2 defusedxml dugong llfuse
+    cython pytest pytest-catchlog
+  ];
+
+  preBuild = ''
+    # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851
+    ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace
+  '';
+
+  checkPhase = ''
+    pytest tests
+  '';
 
   meta = with stdenv.lib; {
     description = "A full-featured file system for online data storage";

From 9bd988eb0f4c4aaa2c89d9898a846edb0dc9aa80 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 10 Mar 2017 20:46:22 +1100
Subject: [PATCH 047/110] sipp: 3.4-beta2 -> 3.5.1

fixes #23945
---
 pkgs/development/tools/misc/sipp/default.nix | 33 ++++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index 266a9824ed2..a506831cd8e 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -1,28 +1,41 @@
-{stdenv, fetchurl, ncurses, libpcap }:
+{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-
-  version = "3.4-beta2";
+  version = "3.5.1";
 
   name = "sipp-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz";
-    sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv";
+  src = fetchFromGitHub {
+    owner = "SIPp";
+    repo = "sipp";
+    rev = "v${version}";
+    sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k";
   };
 
-  configurePhase = ''
-    export ac_cv_lib_curses_initscr=yes
-    export ac_cv_lib_pthread_pthread_mutex_init=yes
+  patchPhase = ''
     sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
-    ./configure --prefix=$out --with-pcap
+    sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac
+    echo "#define SIPP_VERSION \"v${version}\"" > include/version.h
   '';
 
+  configureFlags = [
+    "--with-pcap"
+  ];
+
   postInstall = ''
     mkdir -pv $out/share/pcap
     cp pcap/* $out/share/pcap
   '';
 
   buildInputs = [ncurses libpcap];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = http://sipp.sf.net;
+    description = "The SIPp testing tool";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
 }
 

From df3044cb2e7f01d5535700b173f61511805c44b8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 16 Mar 2017 11:57:19 +0100
Subject: [PATCH 048/110] chromium: flashplayer: 24.0.0.221 -> 25.0.0.127

[Critical security fix]
https://github.com/NixOS/nixpkgs/pull/23889
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 02b7ec34cfc..f202aee3828 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "24.0.0.221";
+    version = "25.0.0.127";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80";
+      sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14";
       stripRoot = false;
     };
 

From 645c2189d14ee95d22efb08e42a2bb3ca7e74a04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Mar 2017 12:39:43 +0100
Subject: [PATCH 049/110] pythonPackages.pytest-django: unpin setuptools_scm

- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
---
 .../{pytestdjango.nix => pytest-django/default.nix}  | 12 ++++++++++++
 pkgs/top-level/python-packages.nix                   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 rename pkgs/development/python-modules/{pytestdjango.nix => pytest-django/default.nix} (64%)

diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytest-django/default.nix
similarity index 64%
rename from pkgs/development/python-modules/pytestdjango.nix
rename to pkgs/development/python-modules/pytest-django/default.nix
index 5a8dd85f4bd..48a5c043841 100644
--- a/pkgs/development/python-modules/pytestdjango.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl
 , pytest, django, setuptools_scm
+, fetchpatch
 }:
 buildPythonPackage rec {
   name = "pytest-django-${version}";
@@ -13,6 +14,17 @@ buildPythonPackage rec {
   buildInputs = [ pytest setuptools_scm ];
   propagatedBuildInputs = [ django ];
 
+  patches = [
+    # Unpin setuptools-scm
+    (fetchpatch {
+      url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
+      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
+    })
+  ];
+
+  # Complicated. Requires Django setup.
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "py.test plugin for testing of Django applications";
     homepage = http://pytest-django.readthedocs.org/en/latest/;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f13e9abedd..97dab697081 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5158,7 +5158,7 @@ in {
     };
   };
 
-  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
+  pytest-django = callPackage ../development/python-modules/pytest-django { };
 
   pytest-fixture-config = buildPythonPackage rec {
     name = "${pname}-${version}";

From 4f531a1d2baf41bdee13d65d6479315ce18a3818 Mon Sep 17 00:00:00 2001
From: rbasso <rbasso@sharpgeeks.net>
Date: Thu, 16 Mar 2017 12:56:55 +0900
Subject: [PATCH 050/110] sc-im: 0.4.0 -> 0.5.0

- Bump version to 0.5.0
- Enable support for reading '.xls' and '.xlsx' files.

The support for reading Excel files depends on:
  - libxml2, which was already a build input.
  - libzip
  - libxls
---
 pkgs/applications/misc/sc-im/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 75d08ec8188..6d9e1c9fcf2 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.5.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
+    sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61";
   };
 
-  buildInputs = [ yacc ncurses libxml2 pkgconfig ];
+  buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];
 
   buildPhase = ''
     cd src
 
-    sed -i "s,prefix=/usr,prefix=$out," Makefile
-    sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+    sed -e "\|^prefix  = /usr/local|   s|/usr/local|$out|" \
+        -e "\|^#LDLIBS += -lxlsreader| s|^#||            " \
+        -e "\|^#CFLAGS += -DXLS|       s|^#||            " \
+        -i Makefile
 
     make
     export DESTDIR=$out

From a17e8e7e72de66bf62108f63348751f86a653d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 16 Mar 2017 15:13:04 +0100
Subject: [PATCH 051/110] servant-auth-server, servant-swagger: enable hydra
 build

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cab70ea6f6d..b693a55de55 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2248,7 +2248,6 @@ extra-packages:
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
@@ -7302,8 +7301,6 @@ dont-distribute-packages:
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-swagger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-swagger-ui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]

From 3fac05b9515dbee23d8d33dad42d947204192483 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Mar 2017 15:45:07 +0100
Subject: [PATCH 052/110] libsodium: 1.0.11 -> 1.0.12

---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index e0ad2100804..bfe224d28cd 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.11";
+  name = "libsodium-1.0.12";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1";
+    sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q";
   };
 
   outputs = [ "out" "dev" ];

From 504b596e5558316240f19711909b0873f820cf7d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 16 Mar 2017 11:01:02 -0400
Subject: [PATCH 053/110] pythonPackages.pathspec_0_5: init

The pre-release version of pants needs it. I'll kill the duplicated copy
once the new version of pants is final.
---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97dab697081..e2fb54ede58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8607,7 +8607,7 @@ in {
 
     propagatedBuildInputs = with self; [
       twitter-common-collections setproctitle setuptools six ansicolors
-      packaging pathspec scandir twitter-common-dirutil psutil requests2
+      packaging pathspec_0_5 scandir twitter-common-dirutil psutil requests2
       pystache pex docutils markdown pygments twitter-common-confluence
       fasteners coverage pywatchman futures cffi
     ];
@@ -8656,6 +8656,7 @@ in {
     };
   };
 
+  # Get rid of this when pants 1.3.0 is released and make 0.5 the default
   pathspec = buildPythonPackage rec {
     pname   = "pathspec";
     version = "0.3.4";
@@ -8674,6 +8675,24 @@ in {
     };
   };
 
+  pathspec_0_5 = buildPythonPackage rec {
+    pname   = "pathspec";
+    version = "0.5.0";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma";
+    };
+
+    meta = {
+      description = "Utility library for gitignore-style pattern matching of file paths";
+      homepage = "https://github.com/cpburnz/python-path-specification";
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
+  };
+
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";
     version = "0.1.2";

From c317e5c85dd5bb239622ba6846b9ad5cec4c91da Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 23:59:57 +0100
Subject: [PATCH 054/110] ldns: split man pages

Saves ~1.8MB
---
 pkgs/development/libraries/ldns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index c35cc588314..91eb7aecea9 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs doc/doxyparse.pl
   '';
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "man" ];
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ openssl ];

From 0526467494476586a715e75c1ac37c5a800df011 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Mar 2017 14:57:07 +0100
Subject: [PATCH 055/110] dnscrypt-proxy: enable additional plugins

Adding ldns builds additional plugins for rewriting DNS queries,
such as blocking and forwarding.

For example, to use a custom domain blocklist, you can do
```nix
let
  myBlockListFile = writeText "blocked-domains" ''
    *.example.com
  '';
in
{
  services.dnscrypt-proxy.extraArgs = [
    "-X libdcplugin_example_ldns_blocking.so,--domains=${myBlockListFile}"
  ];
}
```
---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 24aa3d4b829..03d21744095 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libsodium, systemd }:
+{ stdenv, fetchurl, pkgconfig, libsodium, ldns, openssl, systemd }:
 
 with stdenv.lib;
 
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
+  # <ldns/ldns.h> depends on <openssl/ssl.h>
+  buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd;
 
   postInstall = ''
     # Previous versions required libtool files to load plugins; they are

From 2e72372c05ee5a4e0c690178c5f6305878a3a777 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Mar 2017 17:19:10 +0100
Subject: [PATCH 056/110] pythonPackages.django_guardian: fix eval

---
 pkgs/development/python-modules/django_guardian.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
index c9217955213..1b31456162b 100644
--- a/pkgs/development/python-modules/django_guardian.nix
+++ b/pkgs/development/python-modules/django_guardian.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, python, fetchurl
 , django_environ, mock, django, six
-, pytest, pytestrunner, pytestdjango, setuptools_scm
+, pytest, pytestrunner, pytest-django, setuptools_scm
 }:
 buildPythonPackage rec {
   name = "django-guardian-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5";
   };
 
-  buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ];
+  buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ];
   propagatedBuildInputs = [ django six ];
 
   checkPhase = ''

From 12da885e45c6abe3bad371e70dcd1f2760e40735 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Thu, 16 Mar 2017 12:21:14 -0400
Subject: [PATCH 057/110] pdfpc: Add darwin support

---
 pkgs/applications/misc/pdfpc/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 2f023412faf..49bcd4fe90a 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig vala ];
   buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
-    libpthreadstubs makeWrapper librsvg ];
+    libpthreadstubs makeWrapper librsvg pcre ];
+
+  cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
 
   postInstall = ''
     wrapProgram $out/bin/pdfpc \
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = https://pdfpc.github.io/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 
 }

From 3cecb95a9debf0382db5103c9c22a9faa6ec4f85 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 15:55:43 -0500
Subject: [PATCH 058/110] libdap: 3.15.1 -> 3.18.3

---
 pkgs/development/libraries/libdap/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 2e76c510bdd..e20b1c95a19 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
 
 stdenv.mkDerivation rec {
-  version = "3.15.1";
+  version = "3.18.3";
   name = "libdap-${version}";
 
-  buildInputs = [ bison libuuid curl libxml2 flex ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libuuid curl libxml2 ];
 
   src = fetchurl {
     url = "http://www.opendap.org/pub/source/${name}.tar.gz";
-    sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f";
+    sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c";
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "A C++ SDK which contains an implementation of DAP";
     homepage = http://www.opendap.org/download/libdap;
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.linux;
   };
 }

From 00b6d820018a296b59076baf3d78995da8faf6c1 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 15:40:47 -0500
Subject: [PATCH 059/110] libcouchbase: 2.5.2 -> 2.7.2

fixes #23932
---
 .../libraries/libcouchbase/default.nix        | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 2784cd90a5c..24ec3d74d36 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
 
-stdenv.mkDerivation {
-  name = "libcouchbase-2.5.2";
-  src = fetchurl {
-    url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz";
-    sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24";
+stdenv.mkDerivation rec {
+  name = "libcouchbase-${version}";
+  version = "2.7.2";
+
+  src = fetchFromGitHub {
+    owner = "couchbase";
+    repo ="libcouchbase";
+    rev = version;
+    sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libevent openssl];
+  buildInputs = [ libevent openssl ];
 
-  meta = {
+  doCheck = true;
+  checkPhase = "ctest";
+
+  meta = with stdenv.lib; {
     description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.asl20;
+    platforms = platforms.unix;
   };
 }

From fd61a33d2b42d86215c1697c8da11218279ac802 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 16 Mar 2017 16:41:44 +0000
Subject: [PATCH 060/110] icewm: fix CFGDIR

---
 pkgs/applications/window-managers/icewm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 861313431b0..ef3ad8fda25 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export cmakeFlags="-DPREFIX=$out"
+    export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm"
   '';
 
   meta = {

From 5d6ea2d64e759e30c5864ca2950c0b5ad9070437 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Fri, 10 Mar 2017 21:59:38 +0100
Subject: [PATCH 061/110] jshon: fix null termination in read_stream.

This fixes a somewhat critical (security?) bug.

We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.

(See <https://github.com/keenerd/jshon/issues/53>.)

fixes #23727
---
 pkgs/development/tools/parsing/jshon/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index 4b35ba0cce2..5406b4e9a0e 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, jansson }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
 
 stdenv.mkDerivation rec {
   name = "jshon-20140712";
@@ -12,14 +12,23 @@ stdenv.mkDerivation rec {
     repo = "jshon";
   };
 
+  patches = [
+    # Fix null termination in read_stream.
+    # https://github.com/keenerd/jshon/issues/53
+    (fetchpatch {
+      url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch;
+      sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl";
+    })
+  ];
+
   buildInputs = [ jansson ];
 
-  patchPhase = 
+  patchPhase =
     ''
       substituteInPlace Makefile --replace "/usr/" "/"
     '';
 
-  preInstall = 
+  preInstall =
     ''
       export DESTDIR=$out
     '';

From 6da60bb10142ba2e63309da048044026f7158d0a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 17:35:18 +0100
Subject: [PATCH 062/110] modules/mlmmj: fix a typo in listaddress folder

---
 nixos/modules/services/mail/mlmmj.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index e2b37522cb1..4a01745eb8b 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -18,7 +18,7 @@ let
   footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
   createList = d: l: ''
     ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l}
-    echo ${listAddress d l} > ${listCtl d l}/listadress
+    echo ${listAddress d l} > ${listCtl d l}/listaddress
     echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders
     echo ${footer d l} > ${listCtl d l}/footer
     echo ${subjectPrefix l} > ${listCtl d l}/prefix

From 92bb91f72f649d49bacb55e3b735455d5a740771 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 17:35:50 +0100
Subject: [PATCH 063/110] mlmmj: add docfiles to output

---
 pkgs/servers/mail/mlmmj/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index 8955f40e565..ddf4fd5d880 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0";
   };
 
+  postInstall = ''
+    # grab all documentation files
+    docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*")
+    install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://mlmmj.org;
     description = "Mailing List Management Made Joyful";
@@ -18,4 +24,4 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
   };
 
-}
\ No newline at end of file
+}

From f28fe4cfae06d8da440f5beef340762768fa9408 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 15 Mar 2017 14:50:16 +0100
Subject: [PATCH 064/110] pythonPackages.pycassa: init at 1.11.2

fixes #23920
---
 .../python-modules/pycassa/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pycassa/default.nix

diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
new file mode 100644
index 00000000000..7d4be3226bd
--- /dev/null
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "pycassa";
+  version = "1.11.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nsqjzgn6v0rya60dihvbnrnq1zwaxl2qwf0sr08q9qlkr334hr6";
+  };
+
+  disabled = isPy3k;
+
+  # Tests are not executed since they require a cassandra up and
+  # running
+  doCheck = false;
+
+  propagatedBuildInputs = [ thrift ];
+
+  meta = {
+    description = "pycassa is a python client library for Apache Cassandra";
+    homepage = http://github.com/pycassa/pycassa;
+    license = stdenv.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2fb54ede58..64de0d30a74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9022,7 +9022,9 @@ in {
     };
   };
 
-   pybluez = buildPythonPackage rec {
+  pycassa = callPackage ../development/python-modules/pycassa { };
+
+  pybluez = buildPythonPackage rec {
     version = "unstable-20160819";
     pname = "pybluez";
     name = "${pname}-${version}";

From b13f408d8bb0cde63a7f164dc0e3f63c72999bbc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Mar 2017 19:43:09 +0000
Subject: [PATCH 065/110] pythonPackages.pycassa: fix evaluation

---
 pkgs/development/python-modules/pycassa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
index 7d4be3226bd..fc8fbcaa8d2 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ thrift ];
 
   meta = {
-    description = "pycassa is a python client library for Apache Cassandra";
+    description = "A python client library for Apache Cassandra";
     homepage = http://github.com/pycassa/pycassa;
-    license = stdenv.licenses.mit;
+    license = stdenv.lib.licenses.mit;
   };
 }

From 6d25f77a643762d718c49ab3fc86e0262d2d38fd Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 11 Mar 2017 17:55:12 +0000
Subject: [PATCH 066/110] nixos: tor: add enableGeoIP

---
 nixos/modules/services/security/tor.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 47f863b96df..3b4d77a6f7b 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -12,6 +12,10 @@ let
   torRc = ''
     User tor
     DataDirectory ${torDirectory}
+    ${optionalString cfg.enableGeoIP ''
+      GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip
+      GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
+    ''}
 
     ${optint "ControlPort" cfg.controlPort}
   ''
@@ -58,6 +62,18 @@ in
         '';
       };
 
+      enableGeoIP = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whenever to configure Tor daemon to use GeoIP databases.
+
+          Disabling this will disable by-country statistics for
+          bridges and relays and some client and third-party software
+          functionality.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";

From a04782581a96d5ee8b4001701432599959ac2dc2 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 11 Mar 2017 18:04:08 +0000
Subject: [PATCH 067/110] nixos: torify: disable by default, add some
 documentation as of why

This `tsocks` wrapper leaks DNS requests to clearnet, meanwhile Tor comes with
`torsocks` which doesn't.

Previous commits to this file state that all of this still useful somehow.
Assuming that it's true, at least let's not confuse users with two different tools
and don't clash with the `tsocks` binary from nixpkgs by disabling this by default.
---
 nixos/modules/services/security/torify.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index a81cdbbc172..a29cb3f33da 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -19,15 +19,23 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.tor.tsocks = {
 
       enable = mkOption {
-        default = cfg.enable && cfg.client.enable;
+        default = false;
         description = ''
-          Whether to build tsocks wrapper script to relay application traffic via TOR.
+          Whether to build tsocks wrapper script to relay application traffic via Tor.
+
+          <important>
+            <para>You shouldn't use this unless you know what you're
+            doing because your installation of Tor already comes with
+            its own superior (doesn't leak DNS queries)
+            <literal>torsocks</literal> wrapper which does pretty much
+            exactly the same thing as this.</para>
+          </important>
         '';
       };
 

From 14315cf4f59daf6efde281ac2be2e27602d39b41 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 21:15:02 -0600
Subject: [PATCH 068/110] babl: 0.1.12 -> 0.1.24

---
 pkgs/development/libraries/babl/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 02b1af5ab52..545612d5c15 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.12";
+  name = "babl-0.1.24";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g";
+    sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
   };
 
-  meta = { 
+  meta = with stdenv.lib; { 
     description = "Image pixel format conversion library";
     homepage = http://gegl.org/babl/;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
   };
 }

From e022cc6541c6b6b9321e8eed001500671c495d9c Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Thu, 16 Mar 2017 18:13:42 -0400
Subject: [PATCH 069/110] gnome3.libgee: Add for Darwin

---
 pkgs/desktops/gnome-3/3.22/core/libgee/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
index 7b49af3c50f..d4697c99a93 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = gnome3.maintainers;
   };
 }

From ca8a0e3c802f51a1369fb9d72327db57bc3a94f9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 14 Mar 2017 19:03:41 -0500
Subject: [PATCH 070/110] libbson:1.1.10 -> 1.6.1

libbson: Removed un-needed deps
---
 pkgs/development/libraries/libbson/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6d64df88d3f..02e4529b759 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,18 +1,18 @@
-{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }:
-
-let
-  version = "1.1.10";
-in
+{ fetchFromGitHub, perl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   name = "libbson-${version}";
+  version = "1.6.1";
 
-  src = fetchzip {
-    url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz";
-    sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s";
+  src = fetchFromGitHub {
+    owner = "mongodb";
+    repo = "libbson";
+    rev = version;
+    sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw";
   };
 
-  buildInputs = [ autoconf automake114x libtool perl which ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ perl ];
 
   meta = with stdenv.lib; {
     description = "A C Library for parsing, editing, and creating BSON documents";

From ed7fb7a26534ae0e0ea4c186a4f7bba090033d56 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Mar 2017 18:41:33 -0500
Subject: [PATCH 071/110] bobcat: 4.02.00 -> 4.07.00 (#23742)

---
 pkgs/development/libraries/bobcat/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index dcd35613d54..c5a6f55681a 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchFromGitHub, icmake
+, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 stdenv.mkDerivation rec {
   name = "bobcat-${version}";
-  version = "4.03.00";
+  version = "4.07.00";
 
   src = fetchFromGitHub {
-    sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0";
+    sha256 = "0ja6rgdw4ng10acp2c0cv9k72i5sgng03i3xi2yshlm2811lgxcs";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";

From b760bfd9f67cff5230fd2f952de8ff771f19176b Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Fri, 17 Mar 2017 00:47:37 +0100
Subject: [PATCH 072/110] clementine: added switches for optional dependences
 (#23730)

Added switches for ipod, mtp, cd and cloud support.

The switch for ipod support, specifically, allows users to build it without libplist, wich is currently marked as insecure.
---
 pkgs/applications/audio/clementine/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 01c8ecaced0..78841da46c5 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -5,6 +5,10 @@
 
 let
   withSpotify = config.clementine.spotify or false;
+  withIpod = config.clementine.ipod or false;
+  withMTP = config.clementine.mtp or true;
+  withCD = config.clementine.cd or true;
+  withCloud = config.clementine.cloud or true;
 
   version = "1.2.3";
 
@@ -30,21 +34,19 @@ let
     gst-plugins-base
     gstreamer
     gvfs
-    libcdio
-    libgpod
     liblastfm
-    libmtp
-    libplist
     pkgconfig
     protobuf
     qca2
     qjson
     qt4
-    sparsehash
     sqlite
     taglib
-    usbmuxd
-  ];
+  ]
+  ++ stdenv.lib.optionals (withIpod) [libgpod libplist usbmuxd]
+  ++ stdenv.lib.optionals (withMTP) [libmtp]
+  ++ stdenv.lib.optionals (withCD) [libcdio]
+  ++ stdenv.lib.optionals (withCloud) [sparsehash];
 
   free = stdenv.mkDerivation {
     name = "clementine-free-${version}";

From c7826f4c9df876324cbc6ee8a048ca0c270950f6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Mar 2017 19:42:45 -0500
Subject: [PATCH 073/110] libibmad: 1.3.12 -> 1.3.13

---
 pkgs/development/libraries/libibmad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index fad5c5d73f4..6a8af9ccac6 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
-  name = "libibmad-1.3.12";
+  name = "libibmad-1.3.13";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
-    sha256 = "0ywkz0rskci414r6h6jd4iz4qjbj37ga2k91z1mlj9xrnl9bbgzi";
+    sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p";
   };
 
   buildInputs = [ libibumad ];

From 66e54f25a160ed1cd9d0a008c2c61f9c30a84eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 17 Mar 2017 01:56:13 +0100
Subject: [PATCH 074/110] dhparams module: condition on enable option (#23661)

Hence, the init/cleanup service only runs when the dhparams module is enabled.
---
 nixos/modules/security/dhparams.nix | 113 ++++++++++++++++------------
 1 file changed, 65 insertions(+), 48 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index c16cd2fafef..55c75713101 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -19,6 +19,12 @@ in
             Note: The name of the DH params is taken as being the name of the
             service it serves: the params will be generated before the said
             service is started.
+
+            Warning: If you are removing all dhparams from this list, you have
+            to leave security.dhparams.enable for at least one activation in
+            order to have them be cleaned up. This also means if you rollback to
+            a version without any dhparams the existing ones won't be cleaned
+            up.
           '';
         type = with types; attrsOf int;
         default = {};
@@ -34,57 +40,68 @@ in
         type = types.str;
         default = "/var/lib/dhparams";
       };
+
+      enable = mkOption {
+        description =
+          ''
+            Whether to generate new DH params and clean up old DH params.
+          '';
+        default = false;
+        type = types.bool;
+      };
     };
   };
 
-  config.systemd.services = {
-    dhparams-init = {
-      description = "Cleanup old Diffie-Hellman parameters";
-      wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
-      serviceConfig.Type = "oneshot";
-      script =
-        # Create directory
-        ''
-          if [ ! -d ${cfg.path} ]; then
-            mkdir -p ${cfg.path}
-          fi
-        '' +
-        # Remove old dhparams
-        ''
-          for file in ${cfg.path}/*; do
-            if [ ! -f "$file" ]; then
-              continue
+  config = mkIf cfg.enable {
+    systemd.services = {
+      dhparams-init = {
+        description = "Cleanup old Diffie-Hellman parameters";
+        wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
+        serviceConfig.Type = "oneshot";
+        script =
+          # Create directory
+          ''
+            if [ ! -d ${cfg.path} ]; then
+              mkdir -p ${cfg.path}
             fi
-        '' + concatStrings (mapAttrsToList (name: value:
-        ''
-            if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
-              continue
-            fi
-        ''
-        ) cfg.params) +
-        ''
-            rm $file
-          done
+          '' +
+          # Remove old dhparams
+          ''
+            for file in ${cfg.path}/*; do
+              if [ ! -f "$file" ]; then
+                continue
+              fi
+          '' + concatStrings (mapAttrsToList (name: value:
+          ''
+              if [ "$file" == "${cfg.path}/${name}.pem" ] && \
+                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
+                continue
+              fi
+          ''
+          ) cfg.params) +
+          ''
+              rm $file
+            done
 
-          # TODO: Ideally this would be removing the *former* cfg.path, though this
-          # does not seem really important
-          rmdir -p --ignore-fail-on-non-empty ${cfg.path}
-        '';
-    };
-  } //
-    mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
-      description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
-      after = [ "dhparams-init.service" ];
-      before = [ "${name}.service" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.Type = "oneshot";
-      script =
-        ''
-          mkdir -p ${cfg.path}
-          if [ ! -f ${cfg.path}/${name}.pem ]; then
-            ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
-          fi
-        '';
-    }) cfg.params;
+            # TODO: Ideally this would be removing the *former* cfg.path, though this
+            # does not seem really important as changes to it are quite unlikely
+            rmdir --ignore-fail-on-non-empty ${cfg.path}
+          '';
+      };
+    } //
+      mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
+        description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
+        after = [ "dhparams-init.service" ];
+        before = [ "${name}.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.Type = "oneshot";
+        script =
+          ''
+            mkdir -p ${cfg.path}
+            if [ ! -f ${cfg.path}/${name}.pem ]; then
+              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
+            fi
+          '';
+      }) cfg.params;
+  };
 }

From e3a77dd49ab72150c8cf23e9603ed4f6a7fb2457 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 10:57:47 +0100
Subject: [PATCH 075/110] ocamlPackages.eliom: 6.0.0 -> 6.2.0

---
 pkgs/development/ocaml-modules/eliom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index d7b0bbd3d48..57f3477edf6 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -10,12 +10,12 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.0.0";
+  version = "6.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "1yaqi5fdzvi2ga412chw5rk3533a3xamwfmias1crk793d43cmpc";
+    sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx";
   };
 
   patches = [ ./camlp4.patch ];

From 9fd4966429e188711844651360ffbb1e3042d93b Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 10:59:57 +0100
Subject: [PATCH 076/110] ocamlPackages.ocsigenserver: add pgocaml support

---
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 8d949497b46..8685097750b 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,6 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
 ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
+, pgocaml
 }:
 
 let mkpath = p: n:
@@ -18,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper camlp4 ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ];
 
   configureFlags = "--root $(out) --prefix /";
 

From bc26feb1d6edfce6b43d0d82e418e0a7c4551c78 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 14:32:19 +0100
Subject: [PATCH 077/110] ocamlPackages.ocsigen_toolkit: init at 1.0

---
 .../ocaml-modules/ocsigen-toolkit/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix

diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
new file mode 100644
index 00000000000..00416c92bb9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }:
+
+buildOcaml rec
+{
+ name = "ocsigen-toolkit";
+ version = "1.0.0";
+
+ propagatedBuildInputs = [ eliom ];
+ buildInputs = [ opam ];
+
+ createFindlibDestdir = true;
+
+ installPhase =
+  ''
+    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
+    make install
+    opam-installer --prefix=$out
+  '';
+
+  src = fetchurl {
+    sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2";
+    url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
+  };
+
+  meta = {
+    homepage = http://ocsigen.org/ocsigen-toolkit/;
+    description = " User interface widgets for Ocsigen applications";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
+
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 43cd2e22e4e..4cd041564f9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -382,6 +382,8 @@ let
 
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
+    ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
+
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
 
     omd = callPackage ../development/ocaml-modules/omd { };

From db05f414bd7eb37d34fbc6e9009e11ce638a3a16 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Thu, 16 Mar 2017 23:15:44 -0300
Subject: [PATCH 078/110] qtmultimedia-5.7: disable alsa on darwin

---
 pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
index 7c1cc5da07e..a48dd38ae6d 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
@@ -1,4 +1,4 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
+{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
 }:
 
@@ -6,7 +6,7 @@ qtSubmodule {
   name = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [
-    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
-  ];
+    pkgconfig gstreamer gst-plugins-base libpulseaudio
+  ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
   qmakeFlags = [ "GST_VERSION=1.0" ];
 }

From cc012b227f47cb1913a446d95bb699967f027e71 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Mar 2017 02:37:38 +0000
Subject: [PATCH 079/110] ocamlPackages.functoria: init at 2.0.2

Functoria is a DSL to describe a set of modules and functors, their
types and how to apply them in order to produce a complete application.

Homepage: https://github.com/mirage/functoria
---
 .../ocaml-modules/functoria/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/functoria/default.nix

diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix
new file mode 100644
index 00000000000..bfcdd4168ca
--- /dev/null
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, bos, cmdliner, ocamlgraph
+}:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-functoria-${version}";
+	version = "2.0.2";
+	src = fetchurl {
+		url = "http://github.com/mirage/functoria/releases/download/${version}/functoria-${version}.tbz";
+		sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	propagatedBuildInputs = [ bos cmdliner ocamlgraph ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "A DSL to organize functor applications";
+		homepage = https://github.com/mirage/functoria;
+		license = stdenv.lib.licenses.isc;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4cd041564f9..03afec1870f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -198,6 +198,8 @@ let
 
     fpath = callPackage ../development/ocaml-modules/fpath { };
 
+    functoria = callPackage ../development/ocaml-modules/functoria { };
+
     functory = callPackage ../development/ocaml-modules/functory { };
 
     gen = callPackage ../development/ocaml-modules/gen { };

From 088a1bc3110d0c0ccbd97570e851a5f4e22ab4c2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 17 Mar 2017 07:34:25 +0000
Subject: [PATCH 080/110] pygame: 1.9.1 -> 1.9.3

---
 .../development/python-modules/pygame/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 226b613a8b4..af7b7aca93c 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,29 +1,24 @@
 { stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11
-, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
 }:
 
 buildPythonPackage rec {
   name = "pygame-${version}";
-  version = "1.9.1";
+  version = "1.9.3";
 
   src = fetchurl {
-    url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz";
-    sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52";
+    url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz";
+    sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m";
   };
 
   buildInputs = [
     SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
-    smpeg portmidi libX11
+    portmidi libX11 freetype
   ];
 
-  # http://ubuntuforums.org/showthread.php?t=1960262
-  disabled = isPy3k;
-
   # Tests fail because of no audio device and display.
   doCheck = false;
 
-  patches = [ ./pygame-v4l.patch ];
-
   preConfigure = ''
     sed \
       -e "s/^origincdirs = .*/origincdirs = []/" \

From 934c8c7a93126090f786f9d061190cf84e7d4473 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 17 Mar 2017 04:32:34 -0400
Subject: [PATCH 081/110] callCabal2nix: Fixed indentation

---
 pkgs/development/haskell-modules/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 6d15d596624..7205f777bcf 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -85,13 +85,13 @@ let
 
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
         callCabal2nix = name: src: args:
-	  let
-	    # Filter out files other than the cabal file. This ensures
-	    # that we don't create new derivations even when the cabal
-	    # file hasn't changed.
-	    justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
-	    drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
-	  in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
+          let
+            # Filter out files other than the cabal file. This ensures
+            # that we don't create new derivations even when the cabal
+            # file hasn't changed.
+            justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
+            drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
+          in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From c216a7121545d3e5f2b0f904fe7c3fc736d9b212 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 17 Mar 2017 17:05:16 +0800
Subject: [PATCH 082/110] terraform: use generic builder and add 0.9.0 (#23979)

---
 .../networking/cluster/terraform/0.8.5.nix    | 34 ---------
 .../networking/cluster/terraform/default.nix  | 75 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 13 +++-
 3 files changed, 60 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform/0.8.5.nix

diff --git a/pkgs/applications/networking/cluster/terraform/0.8.5.nix b/pkgs/applications/networking/cluster/terraform/0.8.5.nix
deleted file mode 100644
index 7f927b58670..00000000000
--- a/pkgs/applications/networking/cluster/terraform/0.8.5.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  name = "terraform-${version}";
-  version = "0.8.5";
-
-  goPackagePath = "github.com/hashicorp/terraform";
-
-  src = fetchFromGitHub {
-    owner  = "hashicorp";
-    repo   = "terraform";
-    rev    = "v${version}";
-    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
-  };
-
-  postInstall = ''
-    # remove all plugins, they are part of the main binary now
-    for i in $bin/bin/*; do
-      if [[ $(basename $i) != terraform ]]; then
-        rm "$i"
-      fi
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Tool for building, changing, and versioning infrastructure";
-    homepage = "https://www.terraform.io/";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
-      jgeerds
-      zimbatm
-    ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 7dc2c5ed498..7e5a1121be9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,34 +1,59 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "terraform-${version}";
-  version = "0.8.8";
+let
+  generic = { version, sha256 }:
+  buildGoPackage rec {
+    name = "terraform-${version}";
 
-  goPackagePath = "github.com/hashicorp/terraform";
+    goPackagePath = "github.com/hashicorp/terraform";
 
-  src = fetchFromGitHub {
-    owner  = "hashicorp";
-    repo   = "terraform";
-    rev    = "v${version}";
+    src = fetchFromGitHub {
+      owner  = "hashicorp";
+      repo   = "terraform";
+      rev    = "v${version}";
+      inherit sha256;
+    };
+
+    postInstall = ''
+      # remove all plugins, they are part of the main binary now
+      for i in $bin/bin/*; do
+        if [[ $(basename $i) != terraform ]]; then
+          rm "$i"
+        fi
+      done
+    '';
+
+    preCheck = ''
+      export HOME=$TMP
+    '';
+
+    doCheck = true;
+
+    meta = with stdenv.lib; {
+      description = "Tool for building, changing, and versioning infrastructure";
+      homepage = https://www.terraform.io/;
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
+    };
+  };
+
+in rec {
+  terraform_0_8_5 = generic {
+    version = "0.8.5";
+    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
+  };
+
+  terraform_0_8_8 = generic {
+    version = "0.8.8";
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  postInstall = ''
-    # remove all plugins, they are part of the main binary now
-    for i in $bin/bin/*; do
-      if [[ $(basename $i) != terraform ]]; then
-        rm "$i"
-      fi
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Tool for building, changing, and versioning infrastructure";
-    homepage = "https://www.terraform.io/";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
-      jgeerds
-      zimbatm
-    ];
+  terraform_0_9_0 = generic {
+    version = "0.9.0";
+    sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g";
   };
+
+  terraform_0_8 = terraform_0_8_8;
+  terraform_0_9 = terraform_0_9_0;
+  terraform = terraform_0_9;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22..bb00f2b07fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17997,11 +17997,18 @@ with pkgs;
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  terraform = callPackage ../applications/networking/cluster/terraform {};
+  inherit (callPackage ../applications/networking/cluster/terraform {})
+    terraform_0_8_5
+    terraform_0_8_8
+    terraform_0_9_0;
 
-  terraform_0_8_5 = callPackage ../applications/networking/cluster/terraform/0.8.5.nix {};
+  terraform_0_8 = terraform_0_8_8;
+  terraform_0_9 = terraform_0_9_0;
+  terraform = terraform_0_8;
 
-  terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
+  terragrunt = callPackage ../applications/networking/cluster/terragrunt {
+    terraform = terraform_0_8;
+  };
 
   terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix {
     terraform = terraform_0_8_5;

From 9b62e41c1e13c363b679f07f4f677cfa2e6c2acd Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 17 Mar 2017 10:07:12 +0000
Subject: [PATCH 083/110] renpy: mark as broken

---
 pkgs/development/interpreters/renpy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 57051bb951f..934d3da6b1f 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation {
     homepage = "http://renpy.org/";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
+    # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
+    # build with the most recent pygame version, and fails to run with 1.9.1.
+    broken = true;
   };
 
   src = fetchurl {

From b4fd04c395e868af9cc70cbc3729ff6cb230ad00 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 17 Mar 2017 14:13:16 +0100
Subject: [PATCH 084/110] pygame_sdl2: init at 6.99.10.1227

---
 pkgs/top-level/python-packages.nix | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64de0d30a74..5e67aac3960 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -307,6 +307,37 @@ in {
 
   pygame-git = callPackage ../development/python-modules/pygame/git.nix { };
 
+  pygame_sdl2 = buildPythonPackage rec {
+    pname = "pygame_sdl2";
+    version = "6.99.10.1227";
+    name = "${pname}-${version}";
+
+    meta = {
+      description = "A reimplementation of parts of pygame API using SDL2";
+      homepage    = "https://github.com/renpy/pygame_sdl2";
+      # Some parts are also available under Zlib License
+      license     = licenses.lgpl2;
+      maintainers = with maintainers; [ raskin ];
+    };
+
+    propagatedBuildInputs = with self; [ ];
+    buildInputs = with pkgs; with self; [
+      SDL2 SDL2_image SDL2_ttf SDL2_mixer
+      cython libjpeg libpng ];
+
+    postInstall = ''
+      ( cd "$out"/include/python*/ ;
+        ln -s pygame-sdl2 pygame_sdl2 || true ; )
+    '';
+
+    src = pkgs.fetchFromGitHub {
+      owner = "renpy";
+      repo = "${pname}";
+      rev = "renpy-${version}";
+      sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
+    };
+  };
+
   pygobject2 = callPackage ../development/python-modules/pygobject { };
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
 

From 8388cb8bff25f2e0689e7fed239d84c1da5ad5e6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 17 Mar 2017 14:14:08 +0100
Subject: [PATCH 085/110] renpy: 6.17.6 -> 6.99.12.4; still a strange mistake
 on launch

---
 .../interpreters/renpy/default.nix            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 934d3da6b1f..0d0cbbab2b5 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL
+{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
 , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
+, glib
 }:
 
 with pythonPackages;
 
 stdenv.mkDerivation {
-  name = "renpy-6.17.6";
+  name = "renpy-6.99.12.4";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -18,19 +19,19 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2";
-    sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic";
+    url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
+    sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
   };
 
   buildInputs = [
     python cython pkgconfig wrapPython
-    SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame
+    SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib
   ];
 
-  pythonPath = [ pygame ];
+  pythonPath = [ pygame_sdl2 ];
 
   RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
-    SDL SDL.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
+    SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
   ]);
 
   buildPhase = ''
@@ -42,12 +43,11 @@ stdenv.mkDerivation {
     cp -r renpy renpy.py $out/share/renpy
     python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
 
-    wrapPythonPrograms
     makeWrapper ${python}/bin/python $out/bin/renpy \
-      --set PYTHONPATH $program_PYTHONPATH \
+      --set PYTHONPATH $PYTHONPATH \
       --set RENPY_BASE $out/share/renpy \
       --add-flags "-O $out/share/renpy/renpy.py"
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${pygame_sdl2}/include/${python.libPrefix}";
 }

From 273e480379b233b91c327e9e63746f387d764851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Fri, 17 Mar 2017 14:51:28 +0100
Subject: [PATCH 086/110] rustNightlyBin: 2017-01-26 -> 2017-03-16 (#23988)

thanks!
---
 pkgs/development/compilers/rust/nightlyBin.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 9916e4555c5..d8d0681a0c2 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage }:
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
 
 let
   inherit (stdenv.lib) optionalString;
@@ -9,7 +9,7 @@ let
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91"
+    then "1d5h34dkm1r1ff562szygn9xk2qll1pjryvypl0lazzanxdh5gv5"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
@@ -19,7 +19,7 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "2017-01-26";
+  version = "2017-03-16";
 in
 
 rec {
@@ -69,7 +69,7 @@ rec {
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper curl ];
     phases = ["unpackPhase" "installPhase"];
 
     installPhase = ''
@@ -78,6 +78,7 @@ rec {
 
       ${optionalString needsPatchelf ''
         patchelf \
+          --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/cargo"
       ''}

From f9f15fff56c669282b3e19eb4f471765e0ca6e7e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Mar 2017 17:01:29 -0500
Subject: [PATCH 087/110] irker: init at 2017-02-12

---
 pkgs/servers/irker/default.nix  | 45 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/servers/irker/default.nix

diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
new file mode 100644
index 00000000000..fb5d49849f8
--- /dev/null
+++ b/pkgs/servers/irker/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, python, pkgconfig
+, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
+
+stdenv.mkDerivation rec {
+  name = "irker-${version}";
+  version = "2017-02-12";
+
+  src = fetchFromGitLab {
+    owner = "esr";
+    repo = "irker";
+    rev = "dc0f65a7846a3922338e72d8c6140053fe914b54";
+    sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p";
+  };
+
+  nativeBuildInputs = [ pkgconfig xmlto docbook2x ];
+
+  buildInputs = [
+    python
+    # Needed for proxy support I believe, which I haven't tested.
+    # Probably needs to be propagated and some wrapPython magic
+    # python.pkgs.pysocks
+  ];
+
+  preBuild = ''
+    export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml'
+  '';
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '-o 0 -g 0' ""
+  '';
+
+  installFlags = [
+    "prefix=/"
+    "DESTDIR=$$out"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "IRC client that runs as a daemon accepting notification requests";
+    homepage = "https://gitlab.com/esr/irker";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22..c5e24eef3c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2383,6 +2383,8 @@ with pkgs;
 
   ipxe = callPackage ../tools/misc/ipxe { };
 
+  irker = callPackage ../servers/irker { };
+
   ised = callPackage ../tools/misc/ised {};
 
   isl = isl_0_17;

From 2807d75dca3121992a7857254727ce91228bc80e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Mar 2017 17:01:56 -0500
Subject: [PATCH 088/110] irkerd service: init

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/irkerd.nix | 67 ++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 nixos/modules/services/misc/irkerd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 627807edb90..740344dad36 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -273,6 +273,7 @@
   ./services/misc/gogs.nix
   ./services/misc/gpsd.nix
   #./services/misc/ihaskell.nix
+  ./services/misc/irkerd.nix
   ./services/misc/leaps.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
diff --git a/nixos/modules/services/misc/irkerd.nix b/nixos/modules/services/misc/irkerd.nix
new file mode 100644
index 00000000000..993d77ba424
--- /dev/null
+++ b/nixos/modules/services/misc/irkerd.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.irkerd;
+  ports = [ 6659 ];
+in
+{
+  options.services.irkerd = {
+    enable = mkOption {
+      description = "Whether to enable irker, an IRC notification daemon.";
+      default = false;
+      type = types.bool;
+    };
+
+    openPorts = mkOption {
+      description = "Open ports in the firewall for irkerd";
+      default = false;
+      type = types.bool;
+    };
+
+    listenAddress = mkOption {
+      default = "localhost";
+      example = "0.0.0.0";
+      type = types.str;
+      description = ''
+        Specifies the bind address on which the irker daemon listens.
+        The default is localhost.
+
+        Irker authors strongly warn about the risks of running this on
+        a publicly accessible interface, so change this with caution.
+      '';
+    };
+
+    nick = mkOption {
+      default = "irker";
+      type = types.str;
+      description = "Nick to use for irker";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.irkerd = {
+      description = "Internet Relay Chat (IRC) notification daemon";
+      documentation = [ "man:irkerd(8)" "man:irkerhook(1)" "man:irk(1)" ];
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.irker}/bin/irkerd -H ${cfg.listenAddress} -n ${cfg.nick}";
+        User = "irkerd";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.irker ];
+
+    users.users.irkerd = {
+      description = "Irker daemon user";
+      isSystemUser = true;
+      group = "irkerd";
+    };
+    users.groups.irkerd = {};
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openPorts ports;
+    networking.firewall.allowedUDPPorts = mkIf cfg.openPorts ports;
+  };
+}

From 017fddb4be7d5c074a0b3e2dfb26b88d5e90ceaf Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 14 Mar 2017 22:14:30 +0100
Subject: [PATCH 089/110] ponyc: 0.11.0 -> 0.11.3

---
 pkgs/development/compilers/ponyc/default.nix     | 4 ++--
 pkgs/development/compilers/ponyc/pony-stable.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 3f1aa85e0fc..e70fee3605b 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.11.0";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0jjzc1711km53zkkxwy4r9ki9yxdx8mdjrp7g3mkr42p7q5h4w70";
+    sha256 = "08wh8rh17bf043glvn7778bwpxyzpm95kgfll645hf2m65n5ncsh";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index cd4859acec2..6e669c97300 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation {
-  name = "pony-stable-2016-10-10";
+  name = "pony-stable-unstable-2017-01-03";
 
   src = fetchFromGitHub {
     owner = "jemc";
     repo = "pony-stable";
-    rev = "fdefa26fed93f4ff81c323f29abd47813c515703";
-    sha256 = "16inavy697icgryyvn9gcylgh639xxs7lnbrqdzcryvh0ck15qxk";
+    rev = "0054b429a54818d187100ed40f5525ec7931b31b";
+    sha256 = "0libx8byzwqjjgxxyiiahiprzzp845xgbk09sx9bzban5cd5j0g5";
   };
 
   buildInputs = [ ponyc ];

From 3728143cbcead48f387dd7297f76138a82ed04de Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 7 Mar 2017 23:47:05 +0100
Subject: [PATCH 090/110] prometheus-unifi-exporter: init at 0.4.0

---
 nixos/modules/module-list.nix                 |   1 +
 .../monitoring/prometheus/unifi-exporter.nix  | 104 ++++++++++++++++++
 .../prometheus/unifi-exporter/default.nix     |  26 +++++
 .../prometheus/unifi-exporter/deps.nix        |  75 +++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 207 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 627807edb90..d6bc34be686 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -334,6 +334,7 @@
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
   ./services/monitoring/prometheus/snmp-exporter.nix
+  ./services/monitoring/prometheus/unifi-exporter.nix
   ./services/monitoring/prometheus/varnish-exporter.nix
   ./services/monitoring/riemann.nix
   ./services/monitoring/riemann-dash.nix
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
new file mode 100644
index 00000000000..e3059e48509
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
@@ -0,0 +1,104 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.unifiExporter;
+in {
+  options = {
+    services.prometheus.unifiExporter = {
+      enable = mkEnableOption "prometheus unifi exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9130;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      unifiAddress = mkOption {
+        type = types.str;
+        example = "https://10.0.0.1:8443";
+        description = ''
+          URL of the UniFi Controller API.
+        '';
+      };
+
+      unifiInsecure = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled skip the verification of the TLS certificate of the UniFi Controller API.
+          Use with caution.
+        '';
+      };
+      
+      unifiUsername = mkOption {
+        type = types.str;
+        example = "ReadOnlyUser";
+        description = ''
+          username for authentication against UniFi Controller API.
+        '';
+      };
+      
+      unifiPassword = mkOption {
+        type = types.str;
+        description = ''
+          Password for authentication against UniFi Controller API.
+        '';
+      };
+      
+      unifiTimeout = mkOption {
+        type = types.str;
+        default = "5s";
+        example = "2m";
+        description = ''
+          Timeout including unit for UniFi Controller API requests.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the unifi exporter.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+    systemd.services.prometheus-unifi-exporter = {
+      description = "Prometheus exporter for UniFi Controller metrics";
+      unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
+            -telemetry.addr :${toString cfg.port} \
+            -unifi.addr ${cfg.unifiAddress} \
+            -unifi.username ${cfg.unifiUsername} \
+            -unifi.password ${cfg.unifiPassword} \
+            -unifi.timeout ${cfg.unifiTimeout} \
+            ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
new file mode 100644
index 00000000000..f866df49b54
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "unifi-exporter-${version}";
+  version = "0.4.0";
+  rev = version;
+
+  goPackagePath = "github.com/mdlayher/unifi_exporter";
+
+  src= fetchFromGitHub {
+    inherit rev;
+    owner = "mdlayher";
+    repo = "unifi_exporter";
+    sha256 = "0mbav3dkrwrgzzl80q590467nbq5j61v5v7mpsbhcn2p7ak0swx4";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
+    homepage = https://github.com/mdlayher/unifi_exporter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ bachp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
new file mode 100644
index 00000000000..1de25a21d8c
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
@@ -0,0 +1,75 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317";
+      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/mdlayher/unifi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdlayher/unifi";
+      rev = "418aad77bdb31a9b97d13f79162b0bac1a38bb25";
+      sha256 = "16hv2mk2vl4lcj1qf2wp9psvffz26b5zsajs2yl21rbx0pcwkcp7";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "a5060f1eaab721946b185b2de468ff83ea5b89cb";
+      sha256 = "1v9qva9c0wrjkl71b0rvvi1qj7l42gvcsj349r4lg8pwni8i6did";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "49fee292b27bfff7f354ee0f64e1bc4850462edf";
+      sha256 = "01vcjzkxs34yyy402rsbxw3md7ia85ls9yzsxhgddcisa3mq23cj";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "a1dba9ce8baed984a2495b658c82687f8157b98f";
+      sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb00f2b07fd..aedf54c708a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10825,6 +10825,7 @@ with pkgs;
   prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
+  prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };

From 427edf1e5d677795d20ebd8c8729a5f1bee20c96 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 17 Mar 2017 16:45:09 +0100
Subject: [PATCH 091/110] robomongo: mark as broken

---
 pkgs/applications/misc/robomongo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index ebd97f6621d..41de15bca51 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.amorsillo ];
+    broken = true;
   };
 }

From 7196d16e3fc4c214c94f8d5ff4ed515d27c17152 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <git@spam.works>
Date: Fri, 17 Mar 2017 12:05:34 -0500
Subject: [PATCH 092/110] shapelib: init at 1.4.0

---
 .../libraries/shapelib/default.nix            | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/shapelib/default.nix

diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
new file mode 100644
index 00000000000..529dee9376a
--- /dev/null
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, proj }:
+
+stdenv.mkDerivation rec {
+  name = "shapelib-1.4.0";
+
+  src = fetchurl {
+    url = "https://download.osgeo.org/shapelib/${name}.tar.gz";
+    sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y";
+  };
+
+  buildInputs =  [ proj ];
+
+  meta = with stdenv.lib; {
+    description = "C Library for reading, writing and updating ESRI Shapefiles";
+    homepage = http://shapelib.maptools.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ehmry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aedf54c708a..39343a20fb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9662,6 +9662,8 @@ with pkgs;
 
   sfml = callPackage ../development/libraries/sfml { };
 
+  shapelib = callPackage ../development/libraries/shapelib { };
+
   skalibs = callPackage ../development/libraries/skalibs { };
 
   slang = callPackage ../development/libraries/slang { };

From fa65cc067b3bbdf4d4cdfb21f24009c297334b28 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <git@spam.works>
Date: Fri, 17 Mar 2017 12:08:23 -0500
Subject: [PATCH 093/110] xaster: init at release 208

---
 pkgs/applications/misc/xastir/default.nix | 37 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/xastir/default.nix

diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
new file mode 100644
index 00000000000..9b27e8fc794
--- /dev/null
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, curl, db, gdal, libgeotiff
+, libXpm, libXt, motif, pcre
+, perl, proj, rastermagick, shapelib
+}:
+
+let
+  version = "208";
+in
+stdenv.mkDerivation {
+  name = "xastir-"+version;
+
+  src = fetchFromGitHub {
+    owner = "Xastir";
+    repo = "Xastir";
+    rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce";
+    sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl";
+  };
+
+  buildInputs =
+    [ autoreconfHook
+      curl db gdal libgeotiff
+      libXpm libXt motif pcre
+      perl proj rastermagick shapelib
+    ];
+
+  configureFlags =
+    [ "--with-motif-includes=${motif}/include" ];
+
+  meta = with stdenv.lib; {
+    description = "Graphical APRS client";
+    homepage = https://xastir.org;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ehmry ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39343a20fb2..2c0e8f3ded3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16001,6 +16001,11 @@ with pkgs;
 
   xara = callPackage ../applications/graphics/xara { };
 
+  xastir = callPackage ../applications/misc/xastir {
+    rastermagick = imagemagick;
+    inherit (xorg) libXt;
+  };
+
   xawtv = callPackage ../applications/video/xawtv { };
 
   xbindkeys = callPackage ../tools/X11/xbindkeys { };

From ff7506d665141f2df5527446df4196be30ed4e4c Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Fri, 17 Mar 2017 17:28:48 +0000
Subject: [PATCH 094/110] tvheadend: fix typo in package description

---
 pkgs/servers/tvheadend/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index ee51ace4b68..b05977a1e25 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "TV steaming server";
+    description = "TV streaming server";
     longDescription = ''
 	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android 
         supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.

From dbee6b6ef8c13e8eb0793b7f1616859d3683a894 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sat, 18 Mar 2017 01:39:03 +0800
Subject: [PATCH 095/110] emem: 0.2.41 -> 0.2.42

---
 pkgs/applications/misc/emem/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index f748318407a..57d3539d271 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.41";
+  version = "0.2.42";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0pg7m4fyrcbm8d5nj96xvvh1cvml501rw34hniqq384waifr2kqs";
+    sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j";
   };
 
-  buildInputs = [ ];
-
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''

From 1129f92f6548b9436e16e9f0a776fdbf84c43752 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 15 Mar 2017 22:01:39 +0100
Subject: [PATCH 096/110] file: 5.28 -> 5.30

---
 pkgs/tools/misc/file/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index b1e9990ea7d..68e4210ad41 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,21 +1,26 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.28";
-
-  buildInputs = [ zlib ];
+  name = "file-${version}";
+  version = "5.30";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
-      "http://distfiles.macports.org/file/${name}.tar.gz"
+      "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "04p0w9ggqq6cqvwhyni0flji1z0rwrz896hmhkxd2mc6dca5xjqf";
+    sha256 = "694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214";
   };
 
-  meta = {
+  buildInputs = [ zlib ];
+
+  doCheck = true;
+
+
+  meta = with stdenv.lib; {
     homepage = "http://darwinsys.com/file";
     description = "A program that shows the type of files";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd2;
+    platforms = platforms.all;
   };
 }

From 908e3ffd65cdedf651158053b92ba16fe16307ce Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 16 Mar 2017 21:03:15 +0100
Subject: [PATCH 097/110] znc: 1.6.4 -> 1.6.5

---
 pkgs/applications/networking/znc/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index f51b41d8568..88d1ae7fae1 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,14 +9,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchurl {
-    url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423";
+    url = "http://znc.in/releases/archive/${name}.tar.gz";
+    sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig";
   };
 
-  buildInputs = [ openssl pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ openssl ]
     ++ optional withPerl perl
     ++ optional withPython python3
     ++ optional withTcl tcl

From 81ad24d4d7ff93d0382f25ff8d963f4627c557fc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 17 Mar 2017 17:19:59 -0400
Subject: [PATCH 098/110] linux: 4.10.2 -> 4.10.3

---
 pkgs/os-specific/linux/kernel/linux-4.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index cdcd4ccc21f..13052bf8913 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.2";
+  version = "4.10.3";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1m5ahr1m36kdni80xj4imhhw26l8621rsaaa3z4gkjmnq6n0bnxr";
+    sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r";
   };
 
   kernelPatches = args.kernelPatches;

From ca3fb4d1d406ab20f7fc3ade0fb92ec0a9d077d1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 17 Mar 2017 17:25:40 -0400
Subject: [PATCH 099/110] linux: 4.4.53 -> 4.4.54

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9c583fe30f8..7a606045603 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.53";
+  version = "4.4.54";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1rpkrlspxs3kfks0vg4dz8n570hpwdw5zymy9g2ky5vwskawvzky";
+    sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk";
   };
 
   kernelPatches = args.kernelPatches;

From 6cc1200bd586dc8eeb930bbc3a25299ea27e5409 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Fri, 17 Mar 2017 21:38:10 +0100
Subject: [PATCH 100/110] marathonctl: init at 2017-03-06

---
 .../virtualization/marathonctl/default.nix    | 25 +++++++++++++++++++
 .../tools/virtualization/marathonctl/deps.nix | 12 +++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/virtualization/marathonctl/default.nix
 create mode 100644 pkgs/tools/virtualization/marathonctl/deps.nix

diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
new file mode 100644
index 00000000000..66618e59122
--- /dev/null
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "marathonctl-unstable-${version}";
+  version = "2017-03-06";
+
+  goPackagePath = "github.com/shoenig/marathonctl";
+  subPackages = [ "." ];
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "shoenig";
+    repo = "marathonctl";
+    rev = "0867e66551fff5d81f25959baf914a8ee11a3a8b";
+    sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/shoenig/marathonctl;
+    description = "CLI tool for Marathon";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ manveru ];
+  };
+}
diff --git a/pkgs/tools/virtualization/marathonctl/deps.nix b/pkgs/tools/virtualization/marathonctl/deps.nix
new file mode 100644
index 00000000000..39efaab9535
--- /dev/null
+++ b/pkgs/tools/virtualization/marathonctl/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/shoenig/config";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shoenig/config";
+      rev = "7d793e7ad7f175ef22743b1ea38acee8267788db";
+      sha256 = "1dhcv1j5xk30kj73dfnx3xqx8mcvk9r8ywp9khgf2kq6wh9sm1qr";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c0e8f3ded3..5fe47cdf560 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,7 @@ with pkgs;
   makeself = callPackage ../applications/misc/makeself { };
 
   marathon = callPackage ../applications/networking/cluster/marathon { };
+  marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
 
   marp = callPackage ../applications/office/marp { };
 

From a8785daf0ea794f1791c598c6cac9db3858b45bb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 13 Mar 2017 22:06:17 +0300
Subject: [PATCH 101/110] emacs: fix runtime GTK3 dependencies

Fixes #23845.
---
 pkgs/applications/editors/emacs/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index fbf8895f971..79c75e76820 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,7 +4,7 @@
 , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null
+, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null
 , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig ]
-    ++ lib.optionals srcRepo [ autoconf automake texinfo ];
+    ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+    ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
 
   buildInputs =
     [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
@@ -66,9 +67,9 @@ stdenv.mkDerivation rec {
       [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
         imagemagick gconf ]
     ++ lib.optional (withX && withGTK2) gtk2
-    ++ lib.optional (withX && withGTK3) gtk3
+    ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
-    ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ];
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ];
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
 

From 953616907493c5b81ba3ec9dd86f1422f4d1fcd3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 17 Mar 2017 23:31:52 +0100
Subject: [PATCH 102/110] nixos/treewide: remove boolean examples for options

They contain no useful information and increase the length of the
autogenerated options documentation.

See discussion in #18816.
---
 nixos/modules/installer/cd-dvd/iso-image.nix             | 1 -
 nixos/modules/programs/adb.nix                           | 1 -
 nixos/modules/programs/gphoto2.nix                       | 1 -
 nixos/modules/programs/mosh.nix                          | 1 -
 nixos/modules/programs/ssmtp.nix                         | 3 ---
 nixos/modules/programs/tmux.nix                          | 5 -----
 nixos/modules/programs/vim.nix                           | 1 -
 nixos/modules/security/grsecurity.nix                    | 3 ---
 nixos/modules/services/backup/rsnapshot.nix              | 1 -
 nixos/modules/services/computing/boinc/client.nix        | 2 --
 nixos/modules/services/databases/cassandra.nix           | 1 -
 nixos/modules/services/databases/openldap.nix            | 1 -
 nixos/modules/services/editors/emacs.nix                 | 3 ---
 nixos/modules/services/mail/offlineimap.nix              | 1 -
 nixos/modules/services/misc/ihaskell.nix                 | 1 -
 nixos/modules/services/misc/taskserver/default.nix       | 1 -
 nixos/modules/services/monitoring/arbtt.nix              | 1 -
 nixos/modules/services/networking/aiccu.nix              | 9 ---------
 nixos/modules/services/networking/ferm.nix               | 1 -
 .../modules/services/networking/firefox/sync-server.nix  | 2 --
 nixos/modules/services/networking/mosquitto.nix          | 1 -
 nixos/modules/services/networking/quagga.nix             | 1 -
 nixos/modules/services/networking/znc.nix                | 3 ---
 nixos/modules/services/scheduling/cron.nix               | 2 +-
 nixos/modules/services/security/haka.nix                 | 1 -
 nixos/modules/services/torrent/deluge.nix                | 2 --
 nixos/modules/services/web-apps/atlassian/crowd.nix      | 1 -
 nixos/modules/services/web-apps/atlassian/jira.nix       | 1 -
 nixos/modules/services/web-servers/caddy.nix             | 1 -
 nixos/modules/services/x11/compton.nix                   | 3 ---
 .../services/x11/desktop-managers/enlightenment.nix      | 1 -
 nixos/modules/services/x11/desktop-managers/gnome3.nix   | 1 -
 nixos/modules/services/x11/desktop-managers/kodi.nix     | 1 -
 nixos/modules/services/x11/desktop-managers/xterm.nix    | 1 -
 nixos/modules/services/x11/hardware/libinput.nix         | 8 --------
 nixos/modules/services/x11/hardware/multitouch.nix       | 4 ----
 nixos/modules/services/x11/hardware/synaptics.nix        | 4 ----
 nixos/modules/services/x11/redshift.nix                  | 1 -
 nixos/modules/services/x11/unclutter-xfixes.nix          | 1 -
 nixos/modules/services/x11/unclutter.nix                 | 1 -
 nixos/modules/services/x11/urxvtd.nix                    | 1 -
 nixos/modules/services/x11/window-managers/exwm.nix      | 1 -
 nixos/modules/services/x11/window-managers/xmonad.nix    | 1 -
 nixos/modules/system/boot/loader/grub/grub.nix           | 1 -
 nixos/modules/tasks/filesystems/zfs.nix                  | 2 --
 nixos/modules/tasks/network-interfaces.nix               | 1 -
 nixos/modules/virtualisation/containers.nix              | 1 -
 47 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 85163305c1e..d4217400352 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -172,7 +172,6 @@ in
 
     isoImage.includeSystemBuildDependencies = mkOption {
       default = false;
-      example = true;
       description = ''
         Set this option to include all the needed sources etc in the
         image. It significantly increases image size. Use that when
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 9ba81899e58..18290555b79 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -10,7 +10,6 @@ with lib;
     programs.adb = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to configure system to use Android Debug Bridge (adb).
diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix
index 47822562aee..ca7c6fb28f5 100644
--- a/nixos/modules/programs/gphoto2.nix
+++ b/nixos/modules/programs/gphoto2.nix
@@ -10,7 +10,6 @@ with lib;
     programs.gphoto2 = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to configure system to use gphoto2.
diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
index 1c29eddf01d..b3aa55e189a 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -14,7 +14,6 @@ in
         Whether to enable mosh. Note, this will open ports in your firewall!
       '';
       default = false;
-      example = true;
       type = lib.types.bool;
     };
   };
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index f5d1873cc5c..7d0cb332099 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -22,7 +22,6 @@ in
       directDelivery = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Use the trivial Mail Transfer Agent (MTA)
           <command>ssmtp</command> package to allow programs to send
@@ -65,7 +64,6 @@ in
       useTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether TLS should be used to connect to the default mail
           server.
@@ -75,7 +73,6 @@ in
       useSTARTTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether the STARTTLS should be used to connect to the default
           mail server.  (This is needed for TLS-capable mail servers
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index f0f8d03505a..ed1d88a420a 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -65,7 +65,6 @@ in {
 
       aggressiveResize = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Resize the window to the size of the smallest session for which it is the current window.
@@ -81,14 +80,12 @@ in {
 
       clock24 = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Use 24 hour clock.";
       };
 
       customPaneNavigationAndResize = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode.";
       };
@@ -124,14 +121,12 @@ in {
 
       newSession = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Automatically spawn a session if trying to attach and none are running.";
       };
 
       reverseSplit = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Reverse the window split shortcuts.";
       };
diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix
index 8476c1accd3..fe0e7f2c6d6 100644
--- a/nixos/modules/programs/vim.nix
+++ b/nixos/modules/programs/vim.nix
@@ -9,7 +9,6 @@ in {
     defaultEditor = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         When enabled, installs vim and configures vim to be the default editor
         using the EDITOR environment variable.
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 3726b6c7818..657b059faf2 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -21,7 +21,6 @@ in
 
     enable = mkOption {
       type = types.bool;
-      example = true;
       default = false;
       description = ''
         Enable grsecurity/PaX.
@@ -30,7 +29,6 @@ in
 
     lockTunables = mkOption {
       type = types.bool;
-      example = false;
       default = true;
       description = ''
         Whether to automatically lock grsecurity tunables
@@ -43,7 +41,6 @@ in
 
     disableEfiRuntimeServices = mkOption {
       type = types.bool;
-      example = false;
       default = true;
       description = ''
         Whether to disable access to EFI runtime services.  Enabling EFI runtime
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 16815bcc860..bb5dcab1dcf 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -26,7 +26,6 @@ in
       enableManualRsnapshot = mkOption {
         description = "Whether to enable manual usage of the rsnapshot command with this module.";
         default = true;
-        example = false;
         type = types.bool;
       };
 
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 91bd463732d..e43b6bbb253 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -12,7 +12,6 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable the BOINC distributed computing client. If this
           option is set to true, the boinc_client daemon will be run as a
@@ -41,7 +40,6 @@ in
       allowRemoteGuiRpc = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           If set to true, any remote host can connect to and control this BOINC
           client (subject to password authentication). If instead set to false,
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index b43b448ed7e..5df4ae57f80 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -310,7 +310,6 @@ in {
     autoBootstrap = mkOption {
       description = "It makes new (non-seed) nodes automatically migrate the right data to themselves.";
       default = true;
-      example = true;
       type = types.bool;
     };
     streamingSocketTimoutInMS = mkOption {
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d76859bf3eb..e884098cb08 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -25,7 +25,6 @@ in
         description = "
           Whether to enable the ldap server.
         ";
-        example = true;
       };
 
       user = mkOption {
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 08fa6de6374..2c5a0c4849e 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -21,7 +21,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to enable a user service for the Emacs daemon. Use <literal>emacsclient</literal> to connect to the
         daemon. If <literal>true</literal>, <varname>services.emacs.install</varname> is
@@ -32,7 +31,6 @@ in {
     install = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to install a user service for the Emacs daemon. Once
         the service is started, use emacsclient to connect to the
@@ -57,7 +55,6 @@ in {
     defaultEditor = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         When enabled, configures emacsclient to be the default editor
         using the EDITOR environment variable.
diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix
index 85ece020905..4b24bd8d081 100644
--- a/nixos/modules/services/mail/offlineimap.nix
+++ b/nixos/modules/services/mail/offlineimap.nix
@@ -12,7 +12,6 @@ in {
     install = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to install a user service for Offlineimap. Once
         the service is started, emails will be fetched automatically.
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index df7b9be0db5..e07a4a44613 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -16,7 +16,6 @@ in
     services.ihaskell = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 826f463bbd7..ba9f52f1904 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -148,7 +148,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable the Taskwarrior server.
 
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix
index 1135c2c441c..a8d5e3b7fa0 100644
--- a/nixos/modules/services/monitoring/arbtt.nix
+++ b/nixos/modules/services/monitoring/arbtt.nix
@@ -10,7 +10,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Enable the arbtt statistics capture service.
         '';
diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix
index 4301da28881..aeb0910d624 100644
--- a/nixos/modules/services/networking/aiccu.nix
+++ b/nixos/modules/services/networking/aiccu.nix
@@ -35,7 +35,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel";
       };
 
@@ -88,21 +87,18 @@ in {
       verbose = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Be verbose?";
       };
 
       automatic = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Automatic Login and Tunnel activation";
       };
 
       requireTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           When set to true, if TLS is not supported on the server
           the TIC transaction will fail.
@@ -124,7 +120,6 @@ in {
       defaultRoute = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Add a default route";
       };
 
@@ -138,7 +133,6 @@ in {
       makeHeartBeats = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           In general you don't want to turn this off
           Of course only applies to AYIYA and heartbeat tunnels not to static ones
@@ -148,21 +142,18 @@ in {
       noConfigure = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Don't configure anything";
       };
 
       behindNAT = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Notify the user that a NAT-kind network is detected";
       };
 
       localIPv4Override = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Overrides the IPv4 parameter received from TIC
           This allows one to configure a NAT into "DMZ" mode and then
diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix
index 8933e166f59..07338ccf4d9 100644
--- a/nixos/modules/services/networking/ferm.nix
+++ b/nixos/modules/services/networking/ferm.nix
@@ -19,7 +19,6 @@ in {
     services.ferm = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to enable Ferm Firewall.
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index 70d2d72ca8b..5c14ceff6a0 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -33,7 +33,6 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable a Firefox Sync Server, this give the opportunity to
           Firefox users to store all synchronized data on their own server. To use this
@@ -78,7 +77,6 @@ in
       allowNewUsers = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Whether to allow new-user signups on the server. Only request by
           existing accounts will be honored.
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index f926cd710c8..2325424ff3c 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -147,7 +147,6 @@ in
 
       allowAnonymous = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Allow clients to connect without authentication.
diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix
index ac83da92063..aab58cc77b9 100644
--- a/nixos/modules/services/networking/quagga.nix
+++ b/nixos/modules/services/networking/quagga.nix
@@ -104,7 +104,6 @@ in
         enable = mkOption {
           type = types.bool;
           default = any isEnabled services;
-          example = true;
           description = ''
             Whether to enable the Zebra routing manager.
 
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 0d41e3ea92c..6d68b790e86 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -132,7 +132,6 @@ in
     services.znc = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Enable a ZNC service for a user.
@@ -251,7 +250,6 @@ in
 
         useSSL = mkOption {
           default = true;
-          example = true;
           type = types.bool;
           description = ''
             Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
@@ -278,7 +276,6 @@ in
  
       mutable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Indicates whether to allow the contents of the `dataDir` directory to be changed
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 6eb277d0a2f..7b1a1599e14 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -39,7 +39,7 @@ in
 
       enable = mkOption {
         type = types.bool;
-        example = true;
+        default = false;
         description = "Whether to enable the Vixie cron daemon.";
       };
 
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index f48a79b1f7f..b64a1b4d03e 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -99,7 +99,6 @@ in
 
       pcap = mkOption {
         default = true;
-        example = false;
         type = types.bool;
         description = "Whether to enable pcap";
       };
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index a9c08b66eb8..2534f09b555 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -13,7 +13,6 @@ in {
       deluge = {
         enable = mkOption {
           default = false;
-          example = true;
           description = "Start the Deluge daemon";
         };
 
@@ -29,7 +28,6 @@ in {
       deluge.web = {
         enable = mkOption {
           default = false;
-          example = true;
           description = ''
             Start Deluge Web daemon.
           '';
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index ada26f8057b..7ff7dc4e574 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -88,7 +88,6 @@ in
         secure = mkOption {
           type = types.bool;
           default = true;
-          example = false;
           description = "Whether the connections to the proxy should be considered secure.";
         };
       };
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 6e31d20d068..0ab94d95eee 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -78,7 +78,6 @@ in
         secure = mkOption {
           type = types.bool;
           default = true;
-          example = false;
           description = "Whether the connections to the proxy should be considered secure.";
         };
       };
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index a49838c876f..eec285f6bc4 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -29,7 +29,6 @@ in
 
     agree = mkOption {
       default = false;
-      example = true;
       type = types.bool;
       description = "Agree to Let's Encrypt Subscriber Agreement";
     };
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index 7cbca1dcddf..d1f7f164e64 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -43,7 +43,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether of not to enable Compton as the X.org composite manager.
       '';
@@ -52,7 +51,6 @@ in {
     fade = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Fade windows in and out.
       '';
@@ -93,7 +91,6 @@ in {
     shadow = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Draw window shadows.
       '';
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index d908553ccdf..38e24e9b709 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -20,7 +20,6 @@ in
 
     services.xserver.desktopManager.enlightenment.enable = mkOption {
       default = false;
-      example = true;
       description = "Enable the Enlightenment desktop environment.";
     };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 21453d1917e..a1790ccd675 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -53,7 +53,6 @@ in {
     services.xserver.desktopManager.gnome3 = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Enable Gnome 3 desktop manager.";
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index de00ff93b17..3ce49b9d2bf 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -11,7 +11,6 @@ in
     services.xserver.desktopManager.kodi = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Enable the kodi multimedia center.";
       };
     };
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index eab91407141..29752ff405e 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -13,7 +13,6 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       default = true;
-      example = false;
       description = "Enable a xterm terminal as a desktop manager.";
     };
 
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index b358550ba41..d75c785270b 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -73,7 +73,6 @@ in {
       clickMethod = mkOption {
         type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]);
         default = null;
-        example = "none";
         description =
           ''
             Enables a click method. Permitted values are none, buttonareas, clickfinger.
@@ -85,14 +84,12 @@ in {
       leftHanded = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enables left-handed button orientation, i.e. swapping left and right buttons.";
       };
 
       middleEmulation = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables middle button emulation. When enabled, pressing the left and right buttons
@@ -103,7 +100,6 @@ in {
       naturalScrolling = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enables or disables natural scrolling behavior.";
       };
 
@@ -131,7 +127,6 @@ in {
       horizontalScrolling = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll
@@ -153,7 +148,6 @@ in {
       tapping = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables or disables tap-to-click behavior.
@@ -163,7 +157,6 @@ in {
       tappingDragLock = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap-
@@ -175,7 +168,6 @@ in {
       disableWhileTyping = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Disable input method while typing.
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index f8386b5e333..0e9eb021494 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
@@ -18,20 +18,17 @@ in {
 
       enable = mkOption {
         default = false;
-        example = true;
         description = "Whether to enable multitouch touchpad support.";
       };
 
       invertScroll = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Whether to invert scrolling direction à la OSX Lion";
       };
 
       ignorePalm = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Whether to ignore touches detected as being the palm (i.e when typing)";
       };
@@ -39,7 +36,6 @@ in {
       tapButtons = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable tap buttons.";
       };
 
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 2a7f4e5cbcd..54454c736c1 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -29,7 +29,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Whether to enable touchpad support.";
       };
 
@@ -102,7 +101,6 @@ in {
       tapButtons = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable tap buttons.";
       };
 
@@ -125,7 +123,6 @@ in {
       palmDetect = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Whether to enable palm detection (hardware support required)";
       };
 
@@ -146,7 +143,6 @@ in {
       horizontalScroll = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable horizontal scrolling (on touchpad)";
       };
 
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 78a97df9877..eb5dfdf9584 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -12,7 +12,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Enable Redshift to change your screen's colour temperature depending on
         the time of day.
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index bd02c5ed989..b94dfb1a26a 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -11,7 +11,6 @@ in {
       description = "Enable unclutter-xfixes to hide your mouse cursor when inactive.";
       type = types.bool;
       default = false;
-      example = true;
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index ebc195d108d..6c789b7578f 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -11,7 +11,6 @@ in {
       description = "Enable unclutter to hide your mouse cursor when inactive";
       type = types.bool;
       default = false;
-      example = true;
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index be36efaa589..57ad93f2017 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -11,7 +11,6 @@ in {
   options.services.urxvtd.enable = mkOption {
     type = types.bool;
     default = false;
-    example = true;
     description = ''
       Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run
       "urxvtc".
diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix
index dbbd8a125d6..dc1d957c170 100644
--- a/nixos/modules/services/x11/window-managers/exwm.nix
+++ b/nixos/modules/services/x11/window-managers/exwm.nix
@@ -21,7 +21,6 @@ in
       enable = mkEnableOption "exwm";
       enableDefaultConfig = mkOption {
         default = true;
-        example = false;
         type = lib.types.bool;
         description = "Enable an uncustomised exwm configuration.";
       };
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6af88d4f645..e25a8ae2282 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -44,7 +44,6 @@ in
 
       enableContribAndExtras = mkOption {
         default = false;
-        example = true;
         type = lib.types.bool;
         description = "Enable xmonad-{contrib,extras} in Xmonad.";
       };
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 5ab2d077551..2d6bf2d58a9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -381,7 +381,6 @@ in
 
       efiInstallAsRemovable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to invoke <literal>grub-install</literal> with
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c8fa6c21a4f..d44209cfa0b 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -109,7 +109,6 @@ in
       forceImportRoot = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Forcibly import the ZFS root pool(s) during early boot.
 
@@ -128,7 +127,6 @@ in
       forceImportAll = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Forcibly import all ZFS pool(s).
 
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 6467259766e..e9a3dca6418 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -548,7 +548,6 @@ in
           };
 
           rstp = mkOption {
-            example = true;
             default = false;
             type = types.bool;
             description = "Whether the bridge interface should enable rstp.";
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index f79854967f1..6adb2c1681a 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -274,7 +274,6 @@ let
       };
       isReadOnly = mkOption {
         default = true;
-        example = true;
         type = types.bool;
         description = "Determine whether the mounted path will be accessed in read-only mode.";
       };

From 63f1a14ae551f650584ac7502b5ee159221d1f92 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 17 Mar 2017 19:03:09 -0500
Subject: [PATCH 103/110] neo4j service: increase file limit, per warning
 emitted at startup (#23961)

---
 nixos/modules/services/databases/neo4j.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index cbba9c2a691..205c8dc610a 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -130,6 +130,7 @@ in {
         ExecStart = "${cfg.package}/bin/neo4j console";
         User = "neo4j";
         PermissionsStartOnly = true;
+        LimitNOFILE = 40000;
       };
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}

From 3f175876e8f470b0860e37b926aa0e9776231556 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 18 Mar 2017 09:36:12 +0900
Subject: [PATCH 104/110] firefox, firefox-bin: 52.0 -> 52.0.1

---
 .../browsers/firefox-bin/sources.nix          | 738 +++++++++---------
 .../networking/browsers/firefox/default.nix   |   4 +-
 2 files changed, 371 insertions(+), 371 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 5e8891385d5..06aca4b58e3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,925 @@
 {
-  version = "52.0";
+  version = "52.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ach/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ach/firefox-52.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "2fc16b1e570004de7dc43b52f6b0123fc650a7717bfcdd1bab161149f8ad7fab7558df6ce48b7a66cf06d773e5edc25087c2642e3a37d34c6c775660730ae7af";
+      sha512 = "9005c3ebc0eebb7e1b29384e931ed5c2b888d0d55c8a3f34133dda908b82df0a437c5f2a6f91288396306e161fd82df2cca4f2c49685f898760b125b6d7743dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/af/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/af/firefox-52.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "0f74ac773789bc2089b9280af5e995f46f92f34c4c90ef4d6d972bb6c67e8cf77857909b88f0419894edaf6057bd0affa4b4551d89e3e3b938b2ae84911a80b7";
+      sha512 = "8b5e3fba883af6b097ec61bb79d3e024e55c59e9f1c3f443f74e944b9b71d56ac8ce7199bbdabff06087e0082db618636d3fc832fdde926a35877046c7baf740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/an/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/an/firefox-52.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "fee74bac85e8b35ca16cbe81aca1d5e180ee6794ebee146d483315ee861f5c4f80797885a2a1a4d6d759fb787fa5e4a252ab66ad6cd5102a1dbaa346ed89d5ab";
+      sha512 = "cf0949e99606dc9f961da9f8324f96f5873ea3f7fc0454aebbf982b43704ae71575371fc8bad84b036348f206e9112ef251a0939185f39d3f0ff15aa3dcccbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ar/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ar/firefox-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2d2f2daf74f829683959411f712c26ae232db3c3e079ef54ee4b12cea20b58a270df580f9256eda9bfb0cbf90bad3890c8d58a5576cea9f5a25e6c17dd581b67";
+      sha512 = "202e602cea8fab71cf3b0cad522986904fa328e181599d7005e7668a115edc3eedc3d03a66eee3a3f2ff3b07b36b43394ab90e5ddd915c89550302c203ce0a27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/as/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/as/firefox-52.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4da8d96beadc799c27d72c56f1294dca5c8e76b5a8bbb2a9637bbbb16ecb47aa563abdc0bae5078eec040c019052e233608feac180596f8dd0787a42c8500222";
+      sha512 = "9eaaad262dbe64e70d21b651f847abeac51c66fc9ee6116847440e4217dae28bbc28d54c8d90ec7e35dc614170c86fd66bbe4d7d4e26359769d3022c3b1194fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ast/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ast/firefox-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7184213214f8687a8de9bf1dd8326c98777e613a47c8e6b3bc283e94c09c5fd11d2360a4df334ca1447bd773614f6b8673ffb67a5323a2d0887efbfd3aad6f97";
+      sha512 = "93bbd1bffd278e0b9ad3f137bfaf28ba0defc95c7c9c646daf034be198051fff59e3905bac5fbddb7e6e4565e21424e0de7fa1d223ff9367d165877fcea88675";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/az/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/az/firefox-52.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d9a791b2a679438686896ebcb995600138fb1cd88310f720afa33e302cb161550dbc628a8f3b2699217ec9275a54920197c2a2e8a9ff8671c0b6d29fe372c60e";
+      sha512 = "a7a431a8d9aff2ed8dec35b60c0802825a69ced5de4683c006feaaf2f7e05c5d19f3944fa2598be2dc6b3013e6483a0897a5924d648a8663e2a7f2647d86d491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bg/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bg/firefox-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1a1f7d34375273786cd2efe5c138aecf55839cc223520a6d31eab84446860f480521e380fa76003fff7a9fb5b41668bb20995c9f8ae50e11dc453e0ea6de3b4b";
+      sha512 = "edf77b166ce81c45f823d1e672ad17b9da4fa598322110c57866d32366e4df99c5b61ad96a5dd6696c5c7af4d8af941d32eedaa4e998e3cdfec1fb7512e2e503";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-BD/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-BD/firefox-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "283255c0527e44e43b9de32940886f038735537f04a83d6ed17dcee7c157ec3cedf1f6e043c7365782417040c9494560623d22552e9b9aebd5ef0a18c6dd38b8";
+      sha512 = "97b39ab362e5c99be87408bf69ac25fa9385a6fa9131e0cb653ab04993e379de1624df6cede9862535cb301244ab16e8356c243ce15970a0e292317c84399426";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-IN/firefox-52.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "973d32d9e8106964bd6fe15064e0bfa851e935f7fecd353e199f88a0dbe5287a2e65740f079a43dcdf35a76a8d0c98d2f24c45e8b92738e38b0a71766d980cd5";
+      sha512 = "8b49ee12c9e9516348268a595b51a808dedb505b94c35ac55e357046e9346998ccc2b94e7540a749dec2c87b3ad6be95dad2f00edf8873feacef2fed162bba2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/br/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/br/firefox-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2b7180ecc0bdd038faabd837e6ce09442e8254d997f50d709fc1e4779f502ebe8d4bf0e3a90657601a9f67a09d88361da0cf354929a043116e613eb9c709f704";
+      sha512 = "b464d2da9bb8a734974e35740c8609ceafc7b731feffdc250fb16d9210c895f582f9e3faac3f70484d76b8c37f435163d6b3d1c0f9c1388f9bd1f473eaad42fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bs/firefox-52.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "9033d98af42e5affe3f5b80dfc16ea6b08660c5a06326a50540b41463ba7356a51e9a1107fa1a698ebd0fb828100050a504a380811c8f1047aa580be28b7d9c9";
+      sha512 = "f323bfb8893c0899810e7f58ce72e569771de10e50d1f711a52df627bd074d95532d09bd9c3dc5579876ef32ba3302e3ec6799f7d8e93fa4830d6584d8a69e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ca/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ca/firefox-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d0ab3be67b331f3a6c18cb1a4036820ecb7e67187ba0fd6fda59b9b6a707482c065dd21d3623796007e5b5cb492f16b95a0a759f950b830c45909910fef8ff74";
+      sha512 = "717cba2c2f690051e60a71f74e0b33d7792ddcf574cf65388de6780bf9bed90c231187a39357332bd389be83279a3b00778a04149adfaefbb6a1047077ff886c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cak/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cak/firefox-52.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6fe7403947b46fcd7535ff86259c4fd1beb36c22b4461f9ed676e38c01feaae6ae80a7711e15340e7a22605ce05b32ebd1786806c96a1e4a30b322d040acd868";
+      sha512 = "53c5a18b593450cac1336b6b16767bde7e3feb8575a5f32e00f57963daaea6a14276679378dddbeed4bf729ce55e929670ff79a65e2b3bc2da882d19a4c750af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cs/firefox-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "31c326df9d697dc5ddba65eb5d3c998c8ecbcda7a14712fda4909fc2ebaaa257247472d315e9d58e17cfa7feb75225cb1d8d20632381e35c3b65f47d21fa0885";
+      sha512 = "464b3b2d86256fa941a8cbbc04e68452961e8562194abc14e3e972a15ac7ccd59472e41e9a3c80ea92e5ddebaf2f56c6ff297efdfa25d3d9a892ce6d75612c14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cy/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cy/firefox-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7c56c2780de97448f796763aef6df581639b27feced5c06e8184da2c242d0cc6500f0e1692e7e2c70f324bd9fba1f1b780146c6e969d89d2053c935cb120ef19";
+      sha512 = "00fc374e844bc59793e60d7813c7c2a255d6fcd62994455eb55a014743bec81b2eb5fa31ba39219d1d7ecfc79751f62913b3dd786d62227bdfb030f7c2d24c3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/da/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/da/firefox-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e3033e0cf9100454e8fe93476a4b9935f1783f2f5489fabe9c2b495efa1af935546f8350178bb89ed71917f7fb11baedbbf90bc95922bb4c8d8214972bb61938";
+      sha512 = "d61608a98197a6c48bc38edbcdfa7cc821fba8221c16534ffe67e6a013e5b1ba23011c3524a8e8f2b07e6f5c86952854cadb4c8b8d04f945f2e6dbfb1fb4aeff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/de/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/de/firefox-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9aa9a36751e14d30e7ac34680e216785d657952254e67b1cf3de33288907019790bd4f865a142551118dbbe12ddbfd28129fc74bc83d3fd96f1c250874f680da";
+      sha512 = "af188724c00163656584d8e28bab102ac3660353a6f78c703b9fa336f1996e7b3598144d0862e31de595b0b40d5345527dbd2c515009f93af9c4452f7faafd25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/dsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/dsb/firefox-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ac543d1f58c287979bc392618051c1d525d72cfd8d51a2eafb611954be12889f40b842ef30b37001686529f8d436d259a56ec37d50e14c096781a0c44de3ed2e";
+      sha512 = "a15754dab9300b45db4369e84f5adad3231763d0de944c589ebb90789b80116233ad159f90ce6ab5275e6e53266e09b1095905fcbca3b857318608174a776a13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/el/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/el/firefox-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "190d0f6eb4b9b34e8535b90444e90983fedc89aec81ae0fa3c22860bee552a1b165e3e3e0531698cbbcb0d24c175479b96a772891d099d39ea3654029dc5e36b";
+      sha512 = "fbefdf3d5f155e726132eac8eb61e2f94352a5377502b9f56e128c386e7950b4a9718c1c50782ef2e98cb2e4c5bb4eeacc11f200ca36c97baa0ad0adbe14b9ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-GB/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-GB/firefox-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "6dbbd4b3a0033fa0fa0eeeca1e141154f90cb1217371a4c5be89f468e8a3529dfac0d9cd624b9cd4d1f93ba52028de8cef3678605f68597e587f644215212bf3";
+      sha512 = "6d492447da62f9d0f759c67b50b88bad0346a9d932f3eea2959b105395488dceb2a773f51c3e75ca97fca4426c3110ce1209fbbed4900f9d7bab1d78e5ec6883";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-US/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-US/firefox-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "55e553adbb74b246a3638f8fb2db5ed4dfe9342d3f2b8fa8924290a45697b68b8cf56ff8b1722326511d6da700f181d686b9e9234a0becded70298b85d41e305";
+      sha512 = "186ddb8b223a968c4a4364dd0ea6a1492149e2290056f3fda58a1436f37312374c1e07775244debecd1044eb51586f43b893b82add94971eacbc86414757c0fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-ZA/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-ZA/firefox-52.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "fef8c97af1e77e077206527f6ec0e06c1176039caad06e9880958c3fc34f4cb121d0a234f1bb1c1beca12877e403b1995ff46ffafcd7ab7849966e961b13c913";
+      sha512 = "1aa8e9c6de59af862b0578b6ff44d3a0e98827c6ddb8ad31d4e6de3f26768b7e302252bb76a7c9c8e0494b49d820806b00d9d89c1618eb44d307bcece7345f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eo/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eo/firefox-52.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "44d5497fd194c5743f2da30ebb19cfd5705c94469bba39803cc94e76b87a7a41c1e5f500b44fb28a7a36b1d4f3cd23c582fdf1c6769c226b4aff3808f31aa23e";
+      sha512 = "5f1b247a37d72c0587ade24f4f4a9fb79f25bd8395e5777524a877d0854cfbb921b62e07a4662d8992d02fc1de6c318d2e28cd3cbeef5ec26ee9f2ef25e87939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-AR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-AR/firefox-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "56a43da6b90755174727734c7d5e2c73cb27c3d81d563b0e50a30e5c7314a6e7af0bec1f51087079caac92fb826c36001c2ca31d526ab4f1051be77a3140551e";
+      sha512 = "e6f1f54b43da0740b14bed00b45db2ae2d23735cbf9baff26b5d828f2e20161b8527d10ac2c2a63351122b7d3f8a2ac4b0d546f136ad063b75eab7255b16ab29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-CL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-CL/firefox-52.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "85a8bc7d4496703350e7c8652d8517ea719b4ff7600b2070f41d815eeaf184dc0110d1a75a8e7d85905d44eab7db1e5f98f6ae2f19efc51123fca79e8ac78b44";
+      sha512 = "9cb2f8c9aac77caeff715e687d239d9a57567e079c61efeec5647eaa65bde141251285509ea066a4f8a053986119cdf731a6d7ba182660ade5e2948cdee0352d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-ES/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-ES/firefox-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7ccf29e7fb6c4259e146601b6d3bce643b2b5424a5940804d6e8c1baa58c0c4b3ee3c1eeb58caef42e4c799c7b3ede6fcff8db117f3de042fb7a52638b658826";
+      sha512 = "21254e11b51050a422ba68ac9df14be6f7f672518a7473e874145f7ff07f9071ae315c0d7395940c38caa8735bf53242f63658f3c2a9cfe12320525e24ded2d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-MX/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-MX/firefox-52.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dcf32d58b6fd5bb7b631305e7be42182a13b0abf0be1f5fc22c969449b152c536ca65892d20d85f5799bf14627449e0b61de3a67cc9f33e23f8494070f7ffa27";
+      sha512 = "98629639d6f6cf4c59ef294dc6b1bc3677babaf9130506e940e288beb4253406862484f1a0953accd25ee10492a5bb3578bbf692b61e7ee36a0b238e7ce6f317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/et/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/et/firefox-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "d67c35211d0220d4f9961ae6fd2664b4e4d5e8341f97f1505c6acdd9bbc57ded445dd167d31efe938b00e2f64240e48bae06d7ae295032e5eef382412fc8ea60";
+      sha512 = "affc635c93901437f078bc4bb07c7f22939429ad20e0ef5171ee53762fe31124115892d77519d6ff59f86d19170ba239cd895273ac84f26aec4283323d7f7682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eu/firefox-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2ae3709537afaaf0bfce3d40ecbd38946258de2a246013c64ed6ba6fbd2ef2898c3c0ba2cb6ec512060353a0e1864b75c3358a709ee940713f45fcdff94e952a";
+      sha512 = "2891294c7e382ac55a9c210d7e824479baa281eec8fdbd6cad6d1dea0baf08caa9051f49530c1aca11b71ce5d50fa475a1e192490c232170ffdb9aafa47d1458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fa/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fa/firefox-52.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ab880a914c5bb3ccfc99814c6c3ff53bb4b5fe151bd4db081cd7f84cbbfe5b85f14550fa83abedef140583d0084562dbf9fd46643716022e7155d19333f979b4";
+      sha512 = "b7df64d26a1155616ef70a8cb99192ab5d9624a4b0649f5829dccdd2fe833cf4aac3aaff86939adb228487b9a75e7fbddd6bbecb3345a3a42113863cf466cb0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ff/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ff/firefox-52.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b3859fd606829d519fbd66c15cde7f22b21129e503e785666e2e76ed8ba9ddb4f2fdac99d0fd45a295f2384e6cb0a92b9b49641a9ec00842590d236a4b49bf43";
+      sha512 = "1341979a105df3a1cd5beca0e99ed6cf177e5245ee550decb2df3b06c867cf629522fda9826a69826a1e5676d728d16315e3822a71f523691d68a5114e68fb6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fi/firefox-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b0bd095d475c786d2e5af898cbbde4e06cca3995363af180b7d56a03830aa30ddabaaae64ba685724778b613262074f5eb3ab17784b547f502ac9170919956cf";
+      sha512 = "01347d4f9d4cf31b3d2c2bca5206ef80123ef4f3b96cab6d9aaee503c497df2ae0a8099e28e9de410a3baee4d7b950f2c840056b690b528dbae5759fdad7e3cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fr/firefox-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "70cfef5874adcbfbedd07a7e6a838d3a7cc0bba3a14d009abb84ec6307b89c5568e5dee13ab435a69a5d8d16083f051da6d7fd01583001dfb4aa514d6820c082";
+      sha512 = "6d5eb134e9b75cdc0f0e4f4119c74f7aa73bd5c4512ebd0371c4ec330ca0c5414b9e6d398ae67284d73011e42ce6ab6e8ef4014cb7d6133d284abae159eae2cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fy-NL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fy-NL/firefox-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e21d8d72c62f504cb46d13a4d386834f4c3fba4e13a7b7851f0a991d52ef68cd8a51283e3c2ab9d1edf18c6955126b0ac397de9f5fc2fbef2e31ffb1ae953964";
+      sha512 = "71e9ad99c3bfe723285ce4437a9b1a5506279186b8f144520e3479ff463d792ce3a53b7681a03de055d69849382616986f383ddc5e59eecd5502fd6a6f745819";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ga-IE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ga-IE/firefox-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b341e6dd7e0506c9ebde9b21bf3a265b476bfbeb6b74f32eb6f062769ee8e70f58e64157165dd8d099fa444a6beff97092e4eb960a98f56938fa387a602cd794";
+      sha512 = "9fae8bdc0b63bc38672f9f7cd3fe6d995d2f2131d4d4ca5f18dca0be21294e8e2328dcca6e630467929764a300f6fd9b82c080afe02a072d4e81f1874894e1b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gd/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gd/firefox-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "fa799e7d9fea0e4ce8f9de26e0adbf113dc95a42174dc70386a1407dede25108d8d27dc41be2929947fec362bd6bb10cda3da0e506cb4c15b77c94cba896885d";
+      sha512 = "750dfe9668cc811e9b72e792223640bda908e5273f03b46e2af68614a070fee1fad999119d750e74eb42c6118dd5b4212c0cd75b3d8f9dc842c6af907938390e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gl/firefox-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f9ffa106084fb083173e07131cfdbde5a45513e14adb5e87d60710ddd43e7be909b212e11eb2c0f3062d973c509d14d89784deb6f68f9fbe83a5bb54efd0f706";
+      sha512 = "dda00c0b6f88dc20516f65781ff9d96e45934c1f92138a1444aa83264a2aea85ea075376af91f71c5311c684a5f9aa9cccb63d67b4a3f2a96045540a161d36df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gn/firefox-52.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "0e2656122941ab02a9fbd4c4614058851b1dbc9f3bc65935fdf357ae29a23bbacbaefcf24d610ae991058debaadd2d17ed308a2fb9c44d3b9430bf31702fed7d";
+      sha512 = "4638c96bb72a53c2c8add3c7f767d58a9dc62ac812665aaa1c46ce840d3f4367a9cd7024794b38ab7e8c2e21ecd2bc94ceb38606dbd1f53b8b2dc1751fd1bb5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gu-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gu-IN/firefox-52.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "1c440a46044ab52b547bb949ff10da02dcf156f6195b2ccde058ce9f43ea866cef96365132302609547969afb9c5ca267eb51c917f6794e23d98dd3f98df5cd6";
+      sha512 = "41af30d770df6c5dde5e55e61ac4f5ac8a6b28bac27c554ab023171ad5eaa973c3b80f64e3ca9fb5db9c7d7943c9c9438ab7b37880f673a1a418e70ddde74624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/he/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/he/firefox-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "22a01a470d56d22707987b84a0bf0a89b5f21c8b77c4255c0a5caa85b9549ac6a9af7f210ea7537d51f48c3ed84096de4df2474d8b2cd59e89b26f3f561d0d4c";
+      sha512 = "023359000792e3ad54764abbb46c3708f248730e5f1c8c067b1bdb81d1fbde83ef44233ab3177fad322b50329c5663aa7a0c89e820a2c8efdafe5b92f134a0e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hi-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hi-IN/firefox-52.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "89d11d581bfee9ef435226c367097270482da889df318e837230aeb28aa4d112bb357ecbe4a1a2c71d43286d10a0a9a1255ed0123f46793f3a121558d70a086c";
+      sha512 = "c2f26a610fec1c18333a01a5e7d44af1303366e9bb071ee945588b5886ce17670ea34c5bda3be647b4067dbb9a6e3f7c9c0751f7a39cc8463bf6c690e2460198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hr/firefox-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "b0b5a0263803b01ed338bd37350ca85184b7fdffc7296e5cbde6d4dc5e3ea1a25035602e8d00090643804f82d9006b6b300d7aebdfd7b58af1a588aa22419b0b";
+      sha512 = "68c04f03fe526b16552a734bc2ddad6dbbe276572586a3ffbe0ad90b8bda7f943fc107eccc9679f0778ca1fc61c475a3b519581c105ff526ff4d4896a6c41eaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hsb/firefox-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "0fedac52dab1961c98a90ccd981c9362aa7f5697c0a2654c0529f33cd8c2e7d7efb0a36589478431cd34b876388bbabb8eb1aafd455afa76d85945ee975a2c61";
+      sha512 = "b07a88ad8c041444a46ae81608de6048e05366fa0756270b4266c2a613246eaba0d7993e589556a92425558a106aa5e7a18d69423d680cd44cfaea6c64a64fc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hu/firefox-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "729c194c24228e008e7464d75b7572fc6287841e24c3cb83c94e0799f70428b405c9effb16cbe0e354c001756eff2c780987a909a2984e3a33a78d09b096164d";
+      sha512 = "14ac0e6a21bed1fd94f67bd04e4b93133c7a1e37b66b84effd2212df0561b88762dc1f4a218487077c060f72fa13cac14d5f8d0d70e016bcef624b6a2c2cef0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hy-AM/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hy-AM/firefox-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9fb96724588559e800cc39adba0619b6d1efeb0fb13f6e0b93e8a59cb1042bc73297bf97c46d838add2cadcd0ad3dcf97fe329c6447f11165770d573a24e7585";
+      sha512 = "8d7808b549c8faee13a06671bd81c46fd896ea479a15723af0e8c70874c70993df3bab9a6013efddc2932cce910a0b52ed5a3ba853bf44fb0b18da6d4251755f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/id/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/id/firefox-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8958cfb1abbf21148c82dece6cf656b543df31bc9125e87f4de01b4c749cc5ef4e4190587b2a14c91ecb27c97f198f1de151c5c32683f61c0855120ad738ec9d";
+      sha512 = "ac3929a73f46bdc6ebc1d185fc53368590beadd0614e8447f390c52ee213459e49eb05a822128572fa2d4c4b128b93e7c1a4b94dfa4c2a4c071ea679d495db72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/is/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/is/firefox-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "14b989d96abd7a21aa5fdc222e803e73744c232d861b392da266e10b2f2be3e72eaa84f57665491c0c7b590ce3724805024c54262f1523c8debe48cb8b318027";
+      sha512 = "e9b49b02dfa2ca87a273803c6a84c981d731e0320fce30a4580fa31d93c9ff06ea4d55f49efe771b008a5af3539a3c8e0fb9ccbd855bef951846dc687219ea4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/it/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/it/firefox-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "1d9b164ae2b4c2265bc2101b409de63fd10f1181a660a61348ea1fd01171fca2f38e716f1a35c5f680fd246532debd18274919bc3dc2f421be0bcb0b7706d8f7";
+      sha512 = "4fe510002bdd30d0d713ea112819365f55fc41de024877dfc02b217fe7ce825e5283838f81acdd0456418b5cfa70c42f071ca36668908b257ada23659042cb12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ja/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ja/firefox-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7cf13ec3bf7bb2e19096732ca8d2f1436296e4955302a8329d80d1ba295c2c622785b370dcc7253070fdbc133a4223e438d37d3b2c2b4fd823c84261907029de";
+      sha512 = "a56937787b4f6fe0fe079ee13a362a6cbbcf8160e0ce08d57d58bca7f14ca4fa34ea62c7ec1081aeefeb271c6f010a31a00ff31bb8d3d913b41382fceb9a3e3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ka/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ka/firefox-52.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "88a54a3c07aa02e1da990b93975879b29dd87b3c4743357a4a029bd58e793539a039695306de9abf4a01161d61f22049f5a7df2eddb8124b3034be68434412fb";
+      sha512 = "3138f39d4a346f1c38ac28c498bd27c34b541c1b389eb0bfcc1957e1da098fe9b2209d46e362eba66eb833a07e77e056e44c179651b7daa88e706c20f26ab0c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kab/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kab/firefox-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "31c9197ae7411208cf9fb543da9ea8e21a770ce160a1f109aeba0ee98beea8a760f74d3ba526d8c75b47510bb0475d523592379e511f3a881279b4af49ea2ba8";
+      sha512 = "8539be22d54dee4a51207bf686260a85c66eabc19efb17d397604d19711776c310f1ceb2bb7e67be797216ba52b8eb6fbafbc63561db8dbff1d62b02baafd6ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kk/firefox-52.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "62cf335828c4ee0f834187c99e2faf03ffe15693d5a7a6d0f9e2756f60f0f014aeb3fa507bbc8dd28a856c98254979c98d5756413c7a7d597b02a2f98bcb5ab9";
+      sha512 = "4df849e9011631763f6a16ebe2e1bee6a0dfc25acebdee417b0b023e1c6279f91ec73ed2703c206b66a55e220425037ed11bf0a4d022d5a94ba8506537c26fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/km/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/km/firefox-52.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "efc614494cb18f21756bb25211c4bdce58af1f43ae927b63c655cd76605a1ee6ea95dedd6398fcf8ef81da2811d8a0e0c46a108a55882e7deea9b27ff089e1c3";
+      sha512 = "b9d063f695030b801502265ff5f93bd56a0812c45c032cfaba2354ff103e8e5c5ecc3ea43a23922c27b36e68887a9180746fe173de428c48c9a9069ab07e3c7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kn/firefox-52.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "0bfcb783ae230f187133f2fa5eb1fc8d77712e34eb41f73bd64bac7501d28f11bbbf79e7fc0b9a8f00d499b27f7d77917050de7b4c90f0c71387cce149c6e745";
+      sha512 = "bad628d1438caaf285d14cd68ccd1f7d7021d1a7cbd28f6b86f3368e8eb7dd4c5eb60d5b75b645fa41b88ece5925e09b87eb69f2b187a1ce63e813537e0baaca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ko/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ko/firefox-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "de4d4f1982351f7013524ee8df8d394888755296724c7c578dc59c5adacf42845aafb31156f69828de49163d72a89f31003140d81b59934bc87ad35e856b9369";
+      sha512 = "d1069067daaee4a20eb41efaaeb211554e110b9ff35d3a71e48248eaa1da6c12242fe66f41a1e38bc53dceb731e1f46e0b77b25a128c4546b2103e817a895ceb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lij/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lij/firefox-52.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "c38525ef79e48ad5e9bc004f2e297598bd86c3aaa578dc525b66b26b5c6b2419daf99b6d45f64739a0d62a03dd281bba2d53b68d4eebdc9ea033b37adc840246";
+      sha512 = "eacc7cb06e9d2bf006c5de5ff52063d76198f0444e66e0352a5cf337f722ec7648baf8555ac5da115254f35471ba176d2f7f5ba3a166005534327481a3c566d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lt/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lt/firefox-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ce6a5628317e81dc1b61a2ff3b5a0347624921bda728ac8b4de19d43270bdf294b1e9f1c8f9460594d53a94707a041ec2a4cdfd7363e1a4c273edc9dd68095e1";
+      sha512 = "04e2984a9060fbb5315aea2f6cc822fb56c6bb73f44e95b410aea0e2748e15f31ff3e6ad869215d13df881300cf1caf55c6fdaf47fbc14472d103772d3ed06c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lv/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lv/firefox-52.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "43fb630b7202264d98cbefd1b9e7c30c804e6023251e161f5f0d3250d5975b385a3beee08142f32b2c140ab0ed223dbf1909294b3e82def4b0ff7794f5695daa";
+      sha512 = "2dfba1438c807e6f19bf659e17a6847f3d84cb6e1afde89026a5b54083ec5a040366a81a9a3d2653f121ab3ddaa8f2d9bf7c5d49d61370f29bad2f0c705137aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mai/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mai/firefox-52.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "3db01d1c2b2bc22ab8ad67fcee00c93106b48b2c8859c726d4efb0d66f86088ac2e31ccd4bac5ec76754a9948c77739e7e0473447b227d3ef11743f655705cff";
+      sha512 = "44ef596b16c11621b9064cef9c441be0d2a859429d59b7f6bdd760eeaaa7c487071da0610f1f2723ab1784a41931dcea31681ed91f9f5075b6dee3657e69feb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mk/firefox-52.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "75d8ca10d3ab0e28947e17a5f64ba5fcad21a9ac68784dc2d0cd80d02ff8faafe6aabcb7b26a7c1f05f665ab18fa276e2f28af0fa8487399e6c466ecbb0128a4";
+      sha512 = "52246cd03b0b9157a641ac25bd159a605ee2ae799c795f61fd5987b5057f0c364df07339e67cbe475fc0c053d1bb5f2244accdefb1e705b5201702272d210712";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ml/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ml/firefox-52.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "7fcf6674469b994b12c8e31fda52be57d8ea9947aeb32dd35f00ac4e0c66d651542b4efaa646c66099bd64c42aeb0358f3a52e4d164b7e91a10bd487eaf23e6e";
+      sha512 = "a5548a153520fe7b930aa2f5645c3b6c73a957d564aa811b548fcc4a4814357fa2f1ca701948aadc2109f0c6ecf5117cda0f0752fbf981f3f65a46ee71543234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mr/firefox-52.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8784880ce70eb5d0ea160f9f26b4446ffb5ad6796299d36912440076f0cce5f59d3a59aaf7e79eb7b2dad5b5c5001498276891b72d77bc8e9a7df6aaab6bf412";
+      sha512 = "863e5c767b9c071f4cd24562b6259fd758b834f091d3e22be26ed7e81d242861fb6a0d401fcd1156b1a3d750243e37bdc4f0ff716024d3eff1dd783bf2153e06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ms/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ms/firefox-52.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "faaa9c67122e362d011db6b5c403375994f397b3a0270d70468154a8f6f1328dec85f6cb9f3fdb239f3b778a605bb83e64f9b5e1ee99d104fc3abd63fa7a1d17";
+      sha512 = "a60877264b3ff2d2b0343f6030f2da7b07f6c21a4d805cf1d125297f49c7bc2b93980293e428c6cbc955b39407def434e503654084e8f1054290786734d89cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nb-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nb-NO/firefox-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "755275081354ab0dbd6ba801b918a59df40af7ea94760042c32dfd08c5625fe94104d0eab83a80baaf93b631d65cf9619fa93c49165521cf05e2fde738bf6edf";
+      sha512 = "2fbff650d3881898e6feb998bb00a77d320ac11d4974bc9ef3f77b6df0bdd07ba2486bf358691163e5cd11d11444c63aca728316bbb3e4ba15b1067d3a9b7962";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nl/firefox-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "05c4dabc37487d7ebc379ccab1c062b43124934c885b277d13b7f6adb8563bab04cc55e0c1824d4a66154db6ca6f10ace14deb962645098cc76ba7291db80e35";
+      sha512 = "9ebf1a1fbd185f1992793b8c13cacd4ef26b7b51c239d69395c02903ba412382bdf21638fb60723f1b3a407ff2591fcf95836a75d4f4d1a660968b9aac513708";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nn-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nn-NO/firefox-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "fde805c087400922a86557511bfdc8fde97843a7a8e0d138dc83c291219bd29dea404b356d0ff87c1ed907e6e749f73962772b1a3d821505451daf6356327d81";
+      sha512 = "9e9fa5784fb5d5f1239f511cdbbcebb7b2dce412f7a038d9dc4a3c5890764621d8949d788de1fd83a2f7bc83e909f0f60591ae1cdcf26d6c09600877cc540a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/or/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/or/firefox-52.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "47e2bd4cc1c955429f5c28e9ae92833ff7e9211bb1251e01f55a6e0e1709c107d7012c4da3e367c2481e67ba3f2091c9145d93b2920362eea4c33be9904ceacc";
+      sha512 = "aba2e5b466aa4f84453937f7750933be5bd0d2005843d4d3c4589fe8a08c622432ad63f59c2fd9150c47591a949a7d1da565cafb6e835ade711f882a4d21114a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pa-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pa-IN/firefox-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4fe0d44c5b3282b6788656a9d0da4681dae7e5737106fc18d10b339d95359035a8a746f3b5c4364b8beb321f82c9e17059d9eb51b79f5173b60aa0541f51359a";
+      sha512 = "698d2541b460bbda27aa1295d790e7c452d372ae32ddb311b6d80e3f90e298a836f86c4c26778ec5060913f716bf8d5bce2364d5d4df8ba74ca883a80770d461";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pl/firefox-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d7f1077f616b9d264ad62c04c1734fcf67729f6fdb0a7f3be4a36b33d9ba247550a42b93c8da0c7f2dc1f552278c104a3efaa80bf4cefb1aacf806025b1c1c12";
+      sha512 = "bf1025eed0a522a8fb9c05c08750d4c471c56181ade3bb3424e8031ca1510d3890484b4e911da8df5ed78956059f4d7bbffc1c82ea40864f96ec4bdc79f550e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-BR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-BR/firefox-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5cadc49cbd2dbf2af20d99620c7015b2cafa687c1739badcbca0c2daa3435b454fa0fcb001e6ab45d685a950be91963d6649218eeabd6895f530a7f5d007bfd3";
+      sha512 = "07dd9bfe0e4f5d1ed239d512b2af4b4153f86c5f94f6464898263e6688daec1b4da5a9e8758f819034f17857a57417afd7a5fc67439fbad1153d5d2d9cafe28b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-PT/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-PT/firefox-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f661dbf60b6b844e7fc085492905b2a568a36170150f1712e10ebcc32f9ab57a805b6b9292c2e4451ee72559120867b0b5c589e97ec4efa1ec64c60a2e283317";
+      sha512 = "7a21921dc0a45a2967e7ece3177f014b8d84e0e08634882785f30f28860a3d56b1b5b224da101bf1bdbd322a6ce354db566a1c51e99d7266a7f532509bc21688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/rm/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/rm/firefox-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "bea3e8846a1030df7513e8d383cbb82f693951803bbc5954658996052f301747fe2a67cff3ffea2f5b7abdceb028c67c3e66a6189615bc2f90f9c03e53e0cf2e";
+      sha512 = "2fdc2e2ec175a6df36a26b5eb7be11455d51ef4d0d66b52f6036f4c743cbe95894aa6c9b904a3911801a798e4f7e53002879ba2f2aca3da14f23cc481276f7b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ro/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ro/firefox-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "9534563f065de5083af1eaff3ff4bd82079c848092f63fad4b0009e475bb4cc23a8a0c17085c00798b16ff2fb9e3b79f6c3b8e981d9ea083e6f3b8c5edcf3ab1";
+      sha512 = "ac4731507c44d65eaf156a4a783e1dd3603e0c86b735c3a488f8b4a7ea4f506db42ceb068a917e1a8f4452213f68ad9779a894180ab7f7856b5e55791660bb14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ru/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ru/firefox-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0cd86a2595715c73a367cac8528abfc07b930274be56f2fe0672161aa27b9e409d9a241ff822d566fed8f4ea7d4795b358e10d929ec77c4992386ad31d49aca9";
+      sha512 = "8b67edacf0fc53168074da44c7a8b2452b0e22cef093b6573333e04df9fc2402d2a55b14ec3139e4cce6eb90d611ac1bb22e4f9f548aa65523941b9786ea23bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/si/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/si/firefox-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "44c760a5c134fe22d0df3e846913f126b2a93129c542e6e4a0d1ad2704d5f275148776568864af08fd4d1f5b50d03d67bb9ca4d07203061522c1974469a27a4b";
+      sha512 = "15b24357e2cbcc2d3903da8cac5179cf56e1b4bd68b693a154960614cca39ac0c55129905448c94f5adea063455c3edbc9b32f5f530c8979fbf48347c7fb359f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sk/firefox-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1af8e84bb1e518e5d21a78a14f4adcbbadc0c3d08afc45923975a320e76492db97f3e0cdc90ea999ff6eb02ef7d717b817bf1ec6ce13d4bbd8e92cad3ce8c6e7";
+      sha512 = "5d5b398b8f0157cb84ac8dd8a0bb091504ad34d1ba4b6daa02b9082fd900878d8dbdd5a8069df7d8e8938d4062145132bce9edbc81238362f761a92d6bbcbe5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sl/firefox-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9d7ca89124f2e1831a762ed210ce89a1ca4cd683382c38083744d1902d357fd7d34e3e573bd54d929a5f03633686f365bdca3ba750c950e97e14209eee65c4fd";
+      sha512 = "0add0946e185b8f926115f0699227b661784a94afc56b2c9c9e03f27b790da8d73748016e86ea9260b16278699cdd72b4603a5bca72e0d9955ccff2807ff82f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/son/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/son/firefox-52.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "aa1d0fc504c528e1f2984bf226285e452ded5ab1d650065cea7c3510b0b22c6c87d7cdc4ff4af902a10e471dfad9cb5d513951ef377c28bac250ebef2b67250d";
+      sha512 = "97140c16c3b77352c2e3f56b4afd61c575d6e302dd98c333375a01e75a487297bbf429ff42a88e291f1dd2883d4119611a7e524e535b73ccf6de3215de29dead";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sq/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sq/firefox-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b2d59c0e085d7e5be9a81dce19e025d36898dd804a549c3304a5bd4853bc2884f3ad6b88ace53f320eb0f1648bb1be9034b8cd153bdca3a8b1a391d0a3c743fa";
+      sha512 = "9c97f6df5b0393ce34f33ee3ec06d21a70e6221c2aee65ff7c115ca5a7f7e82e3e3ccaef5e41c33d72281109ee03664f63240f20c15f6de254a712ad8a0187c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sr/firefox-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1de0f66b93b22185a58ecae73c1be5497c4d5e2c2f62d9d91775717023e1793cc08fd2ee12e03a39aa008fce8c5a344de92777b00d53dbcf4c80948a627ab329";
+      sha512 = "dbe2f803ef838ea0da7188a566619cc547e272d458a138b5d3b7d1109e708d3d1c72901276f745bec2ad65ec68112ad88523400f805dad48841b9f2e6266aac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sv-SE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sv-SE/firefox-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2f763fc403c14032a2588a2aff730a04c8b3aa4f8b3fa3f812f316db99753a6e9238eba544102800192c879f6c6e5e30e94a1dd11f3cdc77ca79d95e59716d9b";
+      sha512 = "555206c262c0ffd953937ffd58ed840585345739ff2868fee0e81df93d2b7bcd8b22ae567a13ea5f67cf06f7065fdc09dcd321a326e974f58f86225dbae93627";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ta/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ta/firefox-52.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e5096461c09ad9cb8e059772f9ccc90592cd11300ea2055746450b7a32b1d2e6a6ef07fc6c5cd31f7afbecbb23dc231b7608e85b3c1a7530599cd9523c3058b0";
+      sha512 = "fd577c71ec42c92a88fd05fc723fba543eeee80114e90b5939d053080574ebfefb2c9d31bd6f0d2625bd4113ec4ed94aa9dcf637a17a7bc0eeb5289552f41d01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/te/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/te/firefox-52.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "e2ff646646643faab7b63cc1114354e03ce1dafdd7f9aae23b0c56a61e64a707e684fc13707d20e8a00f191cf540afc985521cacc70e66cbd50ce06e78ebe6d0";
+      sha512 = "9b9f893c25394102f026d0be65173802aeee0999031cdf4a7c3e4964df5075bec2a1a3ebf029014b4a50623f8265672992ad78214a551fcaf776adf659ed5fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/th/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/th/firefox-52.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "724470cf2f1cc4b64f8e2b3c2b49a6fbe67702f76d123f171e637980ab0fadd28731ec31680389dab4ef216e5cd82ff2e3ae1f8eea86e9c8c329406fa41af44e";
+      sha512 = "6511ec6a5c1229181849af9040fb2cdf12d13907731522312bc130880c78d698d3b8d0ec8bb31d080399de7f3beb29c2fe45b6d9d9d3a9c550996c1cf9496607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/tr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/tr/firefox-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "eadd1ff93b30212388e4bfb911ed7302badc30f64016366ca2eac69098fd4ab79c8bf7d352d9b91f1fd9c512693585b9673b2aee0ed739dac8db2cf913e1597e";
+      sha512 = "26a076902a0eefed3f893ea72da54e233dc13d5bc0abcbb95cd75c68778526eb961d23315018456539811548ee66030d7b1ba02049574b6b2f6eed9bac16b8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uk/firefox-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2a01e79f7ca1a497605597a2fa164927d5ad6798aa70e8e4f2f72711a6f928ab3a06fe8be288ed220ea7e4e59d24d3283ff9a437ef5359e39392f35e053b33f7";
+      sha512 = "d9f4cc9900a77e7de0cc0859af7ed1c83447b9a3cac52c4453a6294a6b85bb3b95b6c6385b65014a73fd92fdc4b014eb5c28ed0ca1aa60a75eaccd3272f67157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uz/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uz/firefox-52.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "882daeb95ec0d8ebd5d6c29b06fe55bc66284cbe0b3d8e404798e0db0d33f27cf3df12a7c4f74f122e8a15bbbcdcad3c97f699c66d813821758019d3e1dd0f3f";
+      sha512 = "a7cf647e57651ceee739af19008877b409791f86d75592e240dadeb0559cbce6316cca3c396f044a5b4d8daa3e0a11e96cc61e3f6c9addf3a22ef59dcaaf370f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/vi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/vi/firefox-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "bef28fbebef2fe622230d72176387bbf4aa115f4aec8b78b4276b1a7c23ad25bb2f92edefa44f989253e7235db6d69f595fa2467a00bd1813b7bc29077347b8c";
+      sha512 = "84e91aa0f8e92b0bb24ff53742e19869c3757343e1c05cbf2fc90aa14bf3917d3ec357f4757dc2932ffb1dd823104c42d6020e0f156a1f7cc21e696462c5d05d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/xh/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/xh/firefox-52.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "dcfdf95811886bea9baa8eb1a46eb4f9419bbeaf1f54d713efc5a3d7d7beaec0d18c79a77221eb7fc246b99aa16193f91de92225fc9c3e8cb795bc9e49887d93";
+      sha512 = "cf97e6aac1723263608a29df8df9e67c9ddeea18f3043f10a4c8f22331f519e6a30d76f2e2b2d42e1f5e24a31812e57387198391b14d726c6c5dd2488e94a820";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-CN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-CN/firefox-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2650644609f4b2ce2a4d82072fcb95e188334cc0190b9dd2bc13e40a035f60029fffc65fea1a6d644eaa049d31503a68095aa1f8b1df8ac9435708f86741a13b";
+      sha512 = "74e10d0cf2e47f4133b25a9351a3a13cd634a4a17986dc896c32accd25fb4f09dab7c141faba5574015da83bb193087b64434a51fdd820b1ca6af82a2672beeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-TW/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-TW/firefox-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3c2439185cb7935203dfb774e23dc0cb759f1357b599a026edd93d24c0617bbcb19eded53cb5c55ccadba3f4bc4fe85351c141337d94ee28c102b024e893ae2f";
+      sha512 = "2f024be661d830f179c5e19bb36415becefcdb2a98a750a09cd80f9a3a9e09f9c3ab113e51ac16ce185f42e3e4d00bfa906f7597f58b0282f3d5a98c690fc981";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ach/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ach/firefox-52.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "672908e232cb36c8d88229ff9c0cf427363a3e046cd3df21398b67897a179637972e01c08e89623bda23fa4ddbc7c76a2d7f1184a7299665269324f5fe0429fd";
+      sha512 = "520a791d0c86a60a7f789451f690fde6cab934e536b5acce4b47e56e95c8d775c9bb5bdeec32e4a694ddfc7bb0301758fbda5b575ca1baec6d134df39b6861ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/af/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/af/firefox-52.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a6f22c97a43b7ac6d001599f280d01e8cebc1910e6af958d0c9d2058ac2af5b42dab1dc3ac00aac1d2f61d068bff351beaf9514a6baf335a10f3efa0205b4ed7";
+      sha512 = "4fa7361db2a87f5c133e262e7006844f9d734765c589f97843fdd3b95127c37e040f9634e11f295ab67a1ceb08fefafc8592658e3730be7d1be7680decdecf61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/an/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/an/firefox-52.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "26b0b7629a11b8ffa20b10eb635c375088d1725a5c829b4f7dfb25d5df3c1a465ec7fc8ce56e36a81794c99ecb758b8462ead8ac4d6f79242c5f6931630e29da";
+      sha512 = "8cd72218d6b9eff75cc009224ca28da2b668c786b111f2761190eb85e5467f980b3ff577cb1de30806b049d92a820aebb854572489140c22e4509f165fb53943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ar/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ar/firefox-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "cccc951ad72024eb5790d2a7d668d4103d76ccd6e760504ca7e2e0755d3e41e426f87c6720d53a7668e17cd7b74cfb0ec22d3ff5f23d6cd547e43f97c7f9c609";
+      sha512 = "a7fcfe0d20d28d15d40f15c6af83e1bef20db2ca8f74e669fb1912b3d7b411b83b8f2081e653048fcce0914800f71f3b07c8119c01f9ea9cc039f94c47681279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/as/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/as/firefox-52.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "1dc216d63a3ba302f532a35d523ff4a3c234c17ae5ad755586ead5fd18b7e530c48c4fd5f8d3a30b679d89a45ed927a5e5a1d6f911f2fe0528989bcaa9128ece";
+      sha512 = "ad2cd9bbfb85458108a2b32aa07a090d05554cf8d60e113035cd92ac877e0a0a7fa2f7ed6a3061bb17977464d635843c4e1902071496b1ba898c74458c2878b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ast/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ast/firefox-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "384211024df02a1a463a078a255093b8a43b728e7062025cefdc1409c7be63ea97ed74b2f843251b0df6622629d11d667a795e478f1eafdcb6ac5ad2a48cfdfd";
+      sha512 = "2fa3f46e646ab0a4774f827de282b8a54f324dd801d30b256988bab79bf2356723f0e0a1d401c04e429e8e4cf91a0a4b4c0b5ac0c793cb3d2fcf82b6bb311832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/az/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/az/firefox-52.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "75bdd785a96262d00e7c2ae01cf7314cc6767f99e65e1e73b580fb7e16c93216a8e6180a3cd7dbb479bd5c2d172bfcfc9664cf8977aa9ae6678c0dc9aaca826e";
+      sha512 = "0d63c772859254b591e62ab45c542247eca411a8230afd8b0dea6b358d6db6e0dfdde43e05337be554c922caa40f13ff6db38e0526572531f32c9f0baa400bd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bg/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bg/firefox-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "888872d2c630a2e3966a50a1789a8d68f199431ae62b81dec5ac06c0fee37524fbba3fcfd035b7869a3bfcc076cdcab6344e449de3df226cfd6c819898e67e4c";
+      sha512 = "2eb0521db20b5cd659c733a18cbb04cf4c15ffdd89482e12df2886d388a85634848108b2ec6508637afae9e36b5ad0ae7b9ee611ba531605db4cae60f1e61ed2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-BD/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-BD/firefox-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "10277429342c915c2043f4865a5b22741bc729fb8592b9527a42f000943756e9ad8116af30857966d6cb6ae6877ddb6ba2a53e719a4ee42b19963548bf66d9b6";
+      sha512 = "f0d2ff957dfb93a11c2a374a30dfb800e39ffa309f2b50419fea33488d4098fcc7e1429d434825c4854a5d27240625f2c1643496d15eaa58853fdcc91a93a601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-IN/firefox-52.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "31819eea3f2b0d2c90a3bc6f4a60207eba4d1eae568b45cb5d8f48dd500702161d5469c2ab3369358140a413041c1cfd9ce62e892fe5bb0db525b5481fc6a44b";
+      sha512 = "2ed01637decdc6e11c686665aaaf1628793590352d804b3f524778c7fc5f1af6e866d28dd1a90acdec105fca392f6aad3e37a4a8d32264e790436df401d60005";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/br/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/br/firefox-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "3320933ae550ab188c8f7f6ad8d317b19439ffe85089e37e23edd24f5ac088b67af4c0968646030683dc02f64ee5c2068cce6f8250114024c8e24f2a9eff0b77";
+      sha512 = "19172c0112eb0ddd67da1f2bd8b759a901f9ce29ee6a85b889317e6f8aa9ea85a9ca6bdab6bfefaa8d65a9b7081300acc5b4eb3bf69b8ffea2eb7de4ba448636";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bs/firefox-52.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "9ac88212fb64d404c43a2292c8a4ab164ea1fae08249cab6fd8dfeded5e51304ae5b2d870a074c49e8ae14c820742d50700072fb6e5584dcd5ce2a06d7c85899";
+      sha512 = "eb4bf2dc8c9d74775a227254f0895d9b10c5e3f72a6c37bf9709eaef555a208b6b455e35e8122e5f96ade59956b7481df5807f4787092b642a6affaf870b8d52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ca/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ca/firefox-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ea1b4565917e7ffba47a7a030cfa69b8405163ef533c01668a5a65159f2f82b9737f43796fb583306d81216f664afe090e8483c37f348d6d107b5924020d6580";
+      sha512 = "7bea06ab95279b5daba518d8d30a506f0f79c3b54f36796318213ac1c2e19aa0763774a0746315f564501930e4930105affacd4997b19f6142c1063b45e5427c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cak/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cak/firefox-52.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a409ae71e157ca692d9919c00ba63679f2e3fe726537fcd49cf38ddae613806be5b9c773a0205013d48815055b6333110d283c48a9651ffb912ba6dedf74accd";
+      sha512 = "c5366697fa4d91ea125bf16073191174158497e548453c310292851fc582b05a70768339397a4076b5347c8f9b4d2ef0ff62a03217295f4eb8717a4027c8562a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cs/firefox-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f236da19b0bea73127a52997a461d704ff7472c3fbac29a57ba54ed18a765eceee6a0a46eceaa70d84de610f7dcdb53fcebdc5b2fb013fb0385e2ffd1fc602cf";
+      sha512 = "80fa7b6e3bff168c3b82d3fc188ec7dd33bac07d4d2629df205ebacd7b795638d4fca0ea80aed5d2ff9128d1bbd66ee48512a6b19c8934a8949db7e85f444642";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cy/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cy/firefox-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "ace481c656d40e5bb88cacc82220b8384ed7bbb686974caab399f52b362f86c2390306eccc5709ff48d5086493e16dbc8e8f387454eef01e8baeffc05dacc5f8";
+      sha512 = "5d7e8741b2880f96c9778e84a07e905ce5c31df4db703ead9f5a8aa23b6ec2a478b760adc02a6747adbcb1f8098716ab0bce2a0cd00de1379961f41682e980a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/da/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/da/firefox-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "50e87a5326f1fba31ae8fe289a022b778136483d0454e81e440198d8e71c29405fbd2c53ea7975b30430d7734298d7e01cc5a9fdc3d3d3adfe6ccb33b4ebda17";
+      sha512 = "ca122f0ab79a17d7c07df8607fb9b0018197319f8a644aec4b56328193009e2fa7f9f0b4a9b4a78027f13702c25061443e3412f9be62bbf4eaf793676b1e7fd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/de/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/de/firefox-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6cab0138fc67670dde0f1b3481d1a6f8d0126d8f336340a52cb87f0cd30942fabdc2a670351f09a63e875a6203f0893c995eec8a556e4240aaf599d0767f4d3e";
+      sha512 = "a813a51c347d34fd9c34d9d65289644946008000d8d93fc3df7ff3f7de66f3cb7fca134af2c6e139dbcb58bf5deecfbdb4b10208bd2f7c424fc00a1d48ece9ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/dsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/dsb/firefox-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f31b7a88244f60f419bf9a4e64dfd1ee93f406ac0d10ad2c4e63e0cb6260f03fcce45b904433fccad0e3c17b9d6fb999b4810e843be645a9ef283e16e6ae1992";
+      sha512 = "bf2a32dc433dcfcf44d205ce54fe8e2697f1485abacf11fb4cb2b7a1a24d149f85b07684f3127db3a44f83b652db1d56fb416d1f809eaef83383a70dbff5bbbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/el/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/el/firefox-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5a61e800101e0f550d1916fa5bc90fc0bbc201379d5f283cb01901385bc7949a658aab272fbec48d5732907ec7355d8e84c73a46611d46daae31439a64c0bcf0";
+      sha512 = "7d7192af4849b104c7b0c410ef27b708ecaac96fabed438baad76d086dcd2bd46e364a163f59b545d941510fbffa82c39785d9957f6cd6d99f0b3786b3d14a35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-GB/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-GB/firefox-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "226f999af2ab4274e7e1e83360b432d25609668814ff54480c3df4d081c0f52c617e89d79dafa86f949e7ef8b5b5ac4f873299c90eb97028ca68593179631452";
+      sha512 = "d19127e4e8ef347b50cff1c1960d0e6ad9e248810d9b346a9fa04b9ebcb8fd6207d3b313aa5ac3fb69fce1f096d5594584e9458f061948ca5efd242d779fcd33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-US/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-US/firefox-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "00cb5b343e186110d0e55fd28d9f11184af27b697a2e63dad0ea6bbacb274ce946574e6395dcd812ca8d1fdc0bf12968af7abddaa0183ba995452423b2a886aa";
+      sha512 = "10a22069e479cf6bb63c4ddaf796b557bc3ab557e17b88fbf4acad26280df5ad46af32d1d39ab85f5d16b58b5d4be5a9b79f5a081cb23a1c4ef9bf6ff69a054b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-ZA/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-ZA/firefox-52.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0c66e49588b1b73fdbed23a1de4eecf9a5920c378deb7ebab415d5f7a159983b198ae4191da177170b8015d4975d83271385e3ecce26148d7c0859442ed877a8";
+      sha512 = "d716e7f3b435234477c68c9ec92c8f1912db6d9e10b8d77519f4731e2423143ee2974fe187f69532e93d0994257844e374e05ee5829e8ffb9d73915eee8dd67d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eo/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eo/firefox-52.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "8246ee3309d4dbf8126132a97407f8af71915a3578f6ebf37693262e3be3658454eb12266b00acf62ee7c987985804bf7c4171225b5ec5ebf2cc97927e626049";
+      sha512 = "088fae14d0ccac9b243e0457ee842b260051a802d3b47318b4b9d6d723af8b272a0c0c0541deca98459c928c5b271e22cc500c70992d3b2e64655ab15bb397b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-AR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-AR/firefox-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b962232b534b0603b7bdcd7af4ac05fe136ca7920f9c37f889a203f42a50ead56053f93a49d153edd04e0d4e865ce71a210673514b86d624c1c4820217f76b8e";
+      sha512 = "aff8ffd7a042f1ef80ba7fd725efdd022b5a8862714888af1e736a1d08ca1df5974ff39f3b465061c3f6c60bdc975432f04dde651165309f9095ef98b51a53b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-CL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-CL/firefox-52.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "034e713a9c5f844fcd2f5911d96dd672c61a3fff9870ab38daab8561d9660b295deb6238b3acc31b0755a043d4c72ea914151a4ffac7a8199ff679d8b1b31272";
+      sha512 = "d8042352f0e54257ce7c96233832cd63d0cb4a0e4d6988a1299a81c9cad01190545c254045f993bff5ae5b2330a6b81baeff582a204674ec236e43ba6492e629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-ES/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-ES/firefox-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8ed0e9d6215aea8c6ffb4212e400063674805329a4cc5135a0d016e04370190349bf166b111c67b43369e43833f8715e53268327696375fc68811e023f55694c";
+      sha512 = "5e6d4473335146bfdc9655b4d610ae94e5cda83e2411c495c4196690c029d7ad37775e727afebcca0ef3325f27278508fb51c61cb978392bee7723eb2e501b8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-MX/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-MX/firefox-52.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a33c8a1ba9e576ac05d3991979028a504cdeddec376fbaf2f2bcca6e4d9fc1edab2f8b34c12f282764b96c49a837bf9d5038a292bb96013233c8e9c60ae65fa7";
+      sha512 = "c59952163414d8a1147ea182ad70af0c2223c2f8497248e7e9585c378b95247c88a89c5c08fa6a80fd39bf71f7bbc60126fc9c103f4d8f4eb6dfd400675666b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/et/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/et/firefox-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4647857b00ddfaf765d1d1cada904d35a2ffae0e0c1d3e2aad073090441d19c5e48b2e837a58ad9d1c20ecff7e44a3bb39f4486c8fb6d84720360e8a5b14827b";
+      sha512 = "a2f17512791b57a94f23a5581978517a9bdf817d313fb8378e7e4e34347fe67ac525ea50d19a73436dd0d8de7ca6a227d16bbbf5458c669fffd5731b868c9854";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eu/firefox-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "327aeee163aa44517914a71971f620116fc68def75e8fc929401c696902f5b6dc35f9c4ca6bc3b4f93f0d116d499e1cf0c49e9296b8e730b3a6d7f644976f109";
+      sha512 = "df4cc75f28a3a0f58b2baa78505e4a9624301e42c3f263f0f46c73a5c36915488de98e8eeaa36544de6881a21fde33c8cb78500dd335a6e904c5fb30df3b6a85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fa/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fa/firefox-52.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "01e489e74b45cf8acb05ec87c4d853ebde51ca228487b8fee9dfece11aac9ed58f0e6a6c2fc6c9935189421d534b2f36e4b51016636c1010a4e93b670aaf9e3c";
+      sha512 = "faf68fba10608a010bec43cc0bd994fab084de47ed7dd4908bf33fbf90369f115ab6964481558763a06ef603ce6ffc4d97db48006a3dfc92fefaf13b8c97e6d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ff/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ff/firefox-52.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b561312de7a9b67ceee00ed5730d8c5951f69d134b93077da06d5bb78f0d26e6a2e89f3acf1141c410f590b1d04c0d50beb78f27007e7bf99255d1dd27fc7347";
+      sha512 = "199159e04b958f9e485a5d643dce371fc19840bd7e9a4f95d7f1281d5eb860e30950583e569e806e0eae90c757917d6bf1bd32d8cadf07ce7b3c82b5771e0f55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fi/firefox-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "c9fa17537106470d29c2a632df636efe33cccc44ee7cc496321b09dd0c69329fff0063d1a2fb52c336235327923f3ce564ea6bbf513148dceb8d647903663e7e";
+      sha512 = "a5ae3dd65552ddc5c8bb843c9860ce070e793ecf67b35a77e005e54c5bfef1174beb0df114b7fb380ad3635465f84e4167f2b247c34a82b9a2208cdfe55986b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fr/firefox-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ec5639f4c9c0f1f6bb30aa8e1269b1d772277b34bd5beb965e52a7ab6558da1e481876765cffa21f04f5a13e6cbfef53150051ac0089c3e35949afeb79e1ba10";
+      sha512 = "a6f0d89b4a6d52fddbac39db1947f8671544bea26b8ed0b2759030398fa5d1e7865fa1200b67da6a8400a470e402bac0dcb97afc49c20de6a101c224ec9d00ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fy-NL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fy-NL/firefox-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9a2b1e4df459dca591f20d5d389196c4d61ad90b968ade5bdbc006f80ffc7aecf4b6d004bba11bc196be490fa93fb0be5f26dba698518130c9cde120ef11f1cf";
+      sha512 = "0facf3356011c6300283eff40bd8311f7e3f75f0eaf46a673f06a0aab807498758d943adc8015e4e649f66041d35107509de402a2514d108075d4398e0201300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ga-IE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ga-IE/firefox-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "ed90e0ac43699ddd648a99c008ec775a2cbb34c5de34fb9ce369e1cde7beb8cd98c3d1f56e45910e121bb91f39112a9e7ffeb97f8847bb7ffac76bbfb9aeb762";
+      sha512 = "7023456136343eb9aaf5ead84df355c03f5cf7d02928ae3ec8e7ba6d7ada3e6aa020bd8b79f9dbf8f8b5d9c2ea15a37d136cbcff215f77452ad75f40a3ff8001";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gd/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gd/firefox-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e79d439d2977b10027d6518b7e8dac32e3da9b38cf72a8ebe2521c255bb41682515db2809fac94bcdcddb5e172e090e76ee990f9670fd8b59cab85f17e61222e";
+      sha512 = "342b1ee75b201661fb588a5f6d8530014378512465ed9beb69608fb9fb32fc7f9308cfe4592ff16f325952b3224c27c16a6c5f0e2236b9eabf048f6b096c8510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gl/firefox-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ebee1f0b709590d60451be8b8ade78340905b098f08f86214a5816e58f173830902717b68a393c91c5274cbbf8da0fa8915800069e5bb2e48c0973e54c07af9c";
+      sha512 = "af25290d169e7b0a4a52e71bbfd2b635347410cd1405a3433dbd14e500d16a8ffc311c25787c2a736abab0361dd1f601de770d8080b023544573e66a14652971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gn/firefox-52.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "479bae9554c8a8061fb98528ed80a7093444daad909820e7c2ffa3a13384a8b3711ff599fb767345f7edac1ba5eca5aba3cced9a7c1a60577a90c0b7db334813";
+      sha512 = "124f5bce4eecd640618e62707b16f8def80fc045c20fceba65a2dad488d60bc8a5ce2e112cb766dc2b463e3d6bd72b4eda612d7c66e727f36c4f3b85cec2b5af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gu-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gu-IN/firefox-52.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "ea7f2fa1f5d90e613496affc5f58dea0621fdd36a4c7b04d3559b72b2606941cd315d7de575c649678c3c0e454961c1d8b4a360d1661f6e4fd4e8426cd8aea62";
+      sha512 = "17d6e909835cfec67f1e3dd4971e1bdd80c07488e5390a21525604ed923be9b7bb3eae18c3d011cc85d83d10d124041c14af2cb49b79b4e8df94f6f38012963b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/he/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/he/firefox-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b757a756643c0093757b843b784bafab71d1d7e50e5bc2b2b47b29479dc27ac754ab5d8cfed842cff58de309ec276fe0c0c0ce72adf87dabbcb46f0514eecef8";
+      sha512 = "70de0d3266df3f9665706f693faebd8c3c29fe1fd7e8c1f391d1366cb094c1178f18baa3947593a3674c2d3c21e1713a5161118c4f241e6c88c47e9b1ec818ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hi-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hi-IN/firefox-52.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7fc338870ecedd35d24ed8f20bfcc82d9ca26465704554f3d808f2fed855866d24cf68038651c4975f73a8ec6f90a297160a367132bf1e9b22a69797b311ab02";
+      sha512 = "fd8a3250fc495115b83b1b4d360c24ad263fe52f6333dccc527807c6a30060b1afbeda1b95e2a86b0f9ae8b6f63165e4c6c8b58f443bbc89f4c9291870a4d2de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hr/firefox-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "c7be8964891258fce40e7d9062914d6ef418f80ac94c864448e292720f14b58ff1dcedac9cd7aff125a2819ef45c7ebdbb277a1ff87b6e8f1b5ac5e4d4e445b6";
+      sha512 = "561996e2fc7a3c2b9450b87e57cb6cdb6bcf7f454b6736c7d9ca764a85834dea40673f7142513c58624c95ee4f70c21122e54d678c1b9d5edb7273ac3d63cb6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hsb/firefox-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6468362c84079699b82aa0899c4605241e9c55d42acaba84d80120b52aa81be339d9ebb90140ae06b2f33475b972aacf74c6c37fbe7a66b59db314bcd01b9313";
+      sha512 = "0ef7119929a28c267e94c5fa7afe583b5da6571753a437a7213c84cbfc18c6459da36595dade5187d7e7b8cfb83efd9430ef43400b85318b661512bc8c12a1bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hu/firefox-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "0c5f56ab09225ced4072e6852be50a352ceb6befda8ba8f420431a6ca3a7d376e73ad11c38044eb7fc1a3a5a8a3dc8f49eba1fea0f17c96401be5a94276e937a";
+      sha512 = "2f27911819f6a625ddf77e02da900f219563e6b070aca76f2c08b9f432c1f15b83eaf09558df4cc1e8a0186938ac4a328f1ceaafa109411dcd270db66f189099";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hy-AM/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hy-AM/firefox-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "c3af17826b66b8faf265c2f2bf8bfd565f916163f3050e8c7d83ca5426749f7c93174be34cfa8b0d0dce6d4ee175ad6977f0fff890f072af1419fd0c8c61145a";
+      sha512 = "dde5aede668eda9fbc212f3b18a2326b24a50f399bc70e2c21f65a1f4df574c614d95be6ef55642829c78507d1ae360fc476e599521a39419e2eede1b6cad586";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/id/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/id/firefox-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "c12627f8fdc7fce12b5803f989e2a038d041482a86f23ca279e2fc1c54509bc98cc11995dce4a5858b85d9755fe8c44c2171bc1c4371a3e86dba1926caa36553";
+      sha512 = "63155285ab64209dfbd71bd5357d754889414b99ff45e9eb393b0ca8938c17152ade97251e3ef48d1d3f197cfa9f2ab1cb57000940216748c43a08174f7d9447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/is/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/is/firefox-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "4adf2f31a05f19cc0d075bc47be810cf813535c0152e2e131b0e0017478733e0db2d81cf26867d9701122d3494bc4bc1693e34351ea60e2ca261efea3634a599";
+      sha512 = "d01c9eaa33cba50f6fef6da0313eff25e2d45c025d0ed3694abaeed833cd84590ecf6d9b7bd7ee5dcfcbdf678b4ec0f39c6a8eddec670124c9a4d79711cd6d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/it/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/it/firefox-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "5fcae4a024210439ab71d41435768283e3cd4ff06d8cbd24e6482559797118398974d42753afb5ddab086cf41f46183827cd3532262625a036c5f22b7de3c9af";
+      sha512 = "40a3934d0c9ee388f80d20ccd38a718ee782aa0a8c1e02d14d68eda8c84454c05dcb944396f5c1b092c3fe8820176314e46f232f734079f84bfd04e4b7767618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ja/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ja/firefox-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "4a881b1c24cd0d679799373c5b13b5e0c4f03f2ffe4128669db300963a19918b99453446e504f5c25e87331fdc09a300bd6ce567894bf56453a84937d8a4c882";
+      sha512 = "506302d0fe4d1198d10f6a12a38e7266585830d2648e1a4a8d5bd58c21836fcc55682137c3b706f4a3c6feee37f88828df8de850a8fba40d3d572e84381c8a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ka/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ka/firefox-52.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c6c120d64184c6171140c23e547b982419f3df12ff5c49ed0a5f7643feabd0d8af0899e9a764b3359d05492bd28598235ca6dc90d0af7dd7cde126243ebf47e1";
+      sha512 = "4d2719f82d245067f7c90da659081e7a5a9f083fae6456911aaeb042863a3796d739b08ff912a6c6ce163121e9b124d96ffd3e557afd2cc238ced8c62fdd4ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kab/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kab/firefox-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "f97796c3ed9fb03637decfa6e3fbf53373d8091668ad7adeb778eed173dc3e8e7665ca1aacfa13b2e09410bb5a93e3e3ecf4333292713c55013ba33a93998362";
+      sha512 = "8c173f08c9d83877fe96c270a22ed96dd101d5e7be0eb0225f592457f5a201946a4582147851058ee8c6bcf03890277ae225e145b7b6a824b412cb8ac3643a2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kk/firefox-52.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "df59e8f662db504fe5368c135a265e0e6f985b14f3402ee0330dee218c699b9828790f3a37081cdf6fca95708770bd1ade2d3140f3c7c804ce624efc74cc2e27";
+      sha512 = "e08260dbd8c179eccf7ecf0fd036e94542652856360ce927a9430d7c9cd8e966c9b71496ac9b98dcf1a0f10b54800bb84b382b797e2d1daf5ea3742692dc6d5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/km/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/km/firefox-52.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "29a03004cce0216508ba7b6f9fdf6f2e9407293c0e95d142d30045cd4ecf347c713c07d12c486dbd7e619e57e500bee15ce6eb539fe9314b7101f6f4fd35cfa8";
+      sha512 = "1bb1d99790cbe604e7c6ffc00b9e29b971391257ff3a04787bdce35d79c2c2ebde81037d4597d5f854fccebf9d8e13b73eb3caa11ec2cc50ed82a7db1da6213f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kn/firefox-52.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "11af63e757722279bb71270349f952e35771a08c3fc182f5a24b02b192775b84d966393c10f19034ef762ea7105b79354642b735e04817465afe90c818ba78ff";
+      sha512 = "426b524506c6d50a7b4625fb3cb0737bfc0f40f1d620f8d59ca60f642d6d5072abeb279722916d285a32653c9d3dffdea480ed7b76bbe81b199082c3af88e3d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ko/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ko/firefox-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51f8c8a08f605877dbfb44eaf2c552221458780cd5b3f8a4124b096c36543dbe9aef1e4dbf7d8b3775d31a5fdfde2d8b71d1f8b1f7beaa826efb211d8751b9bb";
+      sha512 = "f24bb055650deb5bafc50105e5eccd1dfd09cd114175ca727c7f955b9e7fecf2be1e9e43df80ca1b986e43c991b6e960281c33654b08ea10e1a7612306253a4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lij/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lij/firefox-52.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a8420d626862c54ea298c75bcb19bd90e55c713ca3b6d6802e8a4d8e7c02ddcd260d11392c9011e6fe807c17b3cedfa579d356e766b531819c89e24cdd4d7977";
+      sha512 = "d53e5e7b56c38f514de40215304982fce5f1d6600ee18fb3cb1f7b9da41b419c74ce1afa2c27bc6b93fa77b7240a3eb020b016dc4f40c744c775626939982686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lt/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lt/firefox-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0c577c917af487d700501205e3267d42db0c1b12c8a3168a053e90cabc1a2a4a111355c0f7a1331367afeaf8f20f662b155738ed9ebb1fc987d8086704b938a4";
+      sha512 = "0c8fe608177aa128573ee86e15788878ba431fb7436c041754d6107189bb46a323b8966402c31175089ab2b343bb44c4dceaf11ee170503817ffb0e2905fef9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lv/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lv/firefox-52.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3df4ca413c2f388d65aef69600be089062731bc3521de3ccb706e1185b5cb40505ac5c9325c8f5d1d91fe8b366d461998eaadd42e090dee1dc4f8b81e0822182";
+      sha512 = "e3d831a73ced3e2e5bc41657c1d0628209f464884d44c242948e3a3c56c956af6f06e6cdd2e85b2ee25300a28aef09c755324db928ba6f7ba3582348afa44c73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mai/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mai/firefox-52.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "a614b5b82df1b71a3880a7ba75bfcf7bd0047b6be7a49126ce2620a6b76590a9798e142f23dff99a67d569978ba565ddd7a33e3ece69cd2c33cf74c3674cf27b";
+      sha512 = "74cde9da097068a888894d61bcaba89ff61efa003586e01083ca06f6d69aeda1831ca68d88b7e00b9eb917e0c2c7085c6486f50190ce50879a431670e347c0e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mk/firefox-52.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "029d1a4196ef641b4da250520f852bf2cd27a4396620fa699777a9f470a019070384098bcc25a8d01410cb2e353cc13df60ca7b8a4fdaf89bbcfe9cf50484e6e";
+      sha512 = "8c9394b7a4ec6cf251071eeee4ffb60ae74c2c0b0cc77ed7b87ed1933220503a9e24438d7f286bca8d667d174f0669573c55dbab961875fead0be92ac5a2ab10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ml/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ml/firefox-52.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "078cb38737ff67e92cfb56fa5a9b18ba39479a92d23e2d70c0a45ddf7533f422f8887db6d4c6483da761ef15b93798e1c8edcf9d469ab484b53bb02d256d531b";
+      sha512 = "68c76f6b39c4e43f618aaab34dde32c0ce35c846d0992098606d0103998a0f8ebd15c296569c7afba7bc85f8916f36a3ab0142a226f2468b74b588af1ffb9bb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mr/firefox-52.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "e16481b30598b84768ceef0e3b50f4f022b0b19d48c01f24f4fb2848244a07c8dc3babfcaadfb237dad6f41434e2fec8a51217850fc6af3f2ce8025eb9b68352";
+      sha512 = "b9732c556ef495c208dc45287d578fc508436365f067f930a9ec44e8cd0c6a9b0e668a07d206d56a9234e37bb80edd1a3b86f97e8b97f102c9b665eb95f58e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ms/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ms/firefox-52.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "bee27e45bda71129c09ad7c26fc678713bbf1ae066d07adab661a96ea4fe0cb7a2ee561541932ae7869b5fdb2367332001aec45cb3a776c23fd98f96a376a770";
+      sha512 = "4c87190253012cdf66129820d50c7e039ae846e4d22564582f9e653847e99a17c4225e3dca222e4d88ae4971756e9e6a116c00bd3d54642709d0935212880ebc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nb-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nb-NO/firefox-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e07bb11cc2158ae8d1d5d5c0d3d9380c50aa11091a55f444a7b84cdaa271cacbf2dac42a39f21aaa636bc51678707b54e2ed393f4c2156fa1e407dd0659ca1cb";
+      sha512 = "3e2b6d33fa7bb6d955781e33c09d36db223baec583ee84bf96d5cac1ea6adad8cde1c929dab075eb1ba44e425c6bb199028536ce1da9f49583508549a806155e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nl/firefox-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b3fdc32a487c7c9f519f8f4de6c547054ed58ec85c76991d6268040844012b85b8a85aa7add09fab2e25fbb0a5f9a645cfc5b51d8a18b735f64678cf0ceddb3c";
+      sha512 = "d13f5483c76d27b10a1b6f95d8c6f45c1d46b606f10b73ea0f8fe182eb1e07e3a708eaf6c5f8e1cbaa8b8832f98613362f7b781f45be4ccb529e48bf25444408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nn-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nn-NO/firefox-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "b78a4caffd59c8610b783c743f6896db2bffd40a910c394473ec7258525557d922bcd8f993d12c2aacc49763f4f1afa0872658d5dc03be662a285b04b54872ff";
+      sha512 = "1e44236fe14462c0922114fc39d45c3b7ffc1d1f51a247d403447dc406820c66b4617f7646b358fb240d220ecda3317d05bb46f127f1bca0460e7be687671c1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/or/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/or/firefox-52.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "2c68f1b4c0becb38ebc75720a1af76a2dd1031bb05d4c9aab05b17d486ec18d3fd3733a4d729b29fc7d1dbcf8ca8a9cdde75429c790de62f3930bf3ab7a52bbf";
+      sha512 = "609ed1aae8c84d2aa1e4c4ce034dee90aee36a01599855b91949e422d63a39aecfe3a7a7038130a9cb93e1874cd0036ad809641c84bfde2ad8893f7c46cb6d39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pa-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pa-IN/firefox-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "69022b727226221c9f412ef47340fa4aa4d9495f617add10f343bac457353aa9bb3eee1ebbcbe16d06625e6fa4f77fbc1d6ce2ba021b90acbbfff8e4bc49e62d";
+      sha512 = "3c5689b2a6d594ceee2b52eedf22ef73fa9138a36abaf9f873b4cead3473dc51e2c53c436fcbeaf247d2b74cb7a880dce72086a99a24a3e19be8f37521d2a8ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pl/firefox-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3852945b017f4d88f0dd59b824fe5d67a904d736d9b9e180d116ed77a4da66d9a5a624c7706b11885d50817aae3a8890b0e6fee0b01f121a5ffe9ceac4184541";
+      sha512 = "3222b352e3f9bc05fa1e5cd96c763cc6b4b7b119cee94886bb6191657789f30f31a49e786b3c46607129c639de658c0d3c53494d556d7d31a17204ec338868a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-BR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-BR/firefox-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "59c7d15417a2f81dbadfa23e27b08fef1d9e4d37f93642ced7dad81158e47d12ea28b620af7ebadb419f90f2a340b9b87dbc5321a77a4580573cc8fa4e0b7368";
+      sha512 = "e2ec0b35ad75c2e8f4d8fea32ea84b59fcdc939d83aec878d84c1d5140d1884fa977fb767be203068a4073b5752f5a1a9b646ded10ad87a47bf8f14f8aa8bd09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-PT/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-PT/firefox-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ec95ff787a5dd3f7b736e97e50333828bbd1726b6c88f95502aa92b245d00eb8bb8ce43f665f75f993c530498ce49642aa99d2466fd7b65921390991859c50e0";
+      sha512 = "bff1ff7109c1da0954685031a25c397828b2ab299f82447a46f773179bda440ab35dd687375b12524d03c48ee46f24ef54ebf02449e332fcef20c84bed7c6394";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/rm/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/rm/firefox-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "88c28449200c951bbb8a08dccbff253176d62e61776c58900fff1f0bfb9daeb65e3d49f0e4a9bb8a962af40b1174d1878c4162cf6aafee65c643b35cd7535565";
+      sha512 = "98771e89b0747de5da54878fc112b4686006891dba3e213c1460f8ad4b8a97d16f68f6969105c4f6e920e78d0fba09326aaf1d4a5f3d3acb9c5aff699e3ffd73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ro/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ro/firefox-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ca333f714287da738d469b32285d9b1496268656206ae4f648896adca89007950548456340b8efbbae61f26b3692f474c1af9112a9d0bc8064502e25a447e6c0";
+      sha512 = "87445f515ab98e5363fd613e50c920d8545feb6e8dbd18eda15fd0e383e4d1525c7d80d6ea50ecae0fde1cb9880a6daabbdded058d009da6fedd3df8d224576c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ru/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ru/firefox-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "75a19e48ac59114456a6e32f1c7557d6ab9a21377c440e88cd018620f85d14d8ef2538e271f04052c47e311d9eeba78a99d5a0f7550d1c4223d86301365dc763";
+      sha512 = "8f7d007fbc550731a42817ae2a9e71eae660fa016e868ec076ef32404e2720d20edc9e56b54d1dff41b2d6771a96bca3052e178e8620646b9a798077135dd498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/si/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/si/firefox-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6423857acae37915ebdd69b1e5868bbe7d8b578f48e7c87fc4ce2dadbb812098a37627c53cc7d56dc66a9431bb8a995e28dc837ebc50cc14ce3edc0cfc6e7733";
+      sha512 = "01ac64cd7a60d606ac9974b7ed1cf6a33d5ee7c99d3afd0514bad6580560e55cf5466c83b8309f09188a68335a556d9e2d5ed5e3d35da4d53fe34c31d4054f26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sk/firefox-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "19e49096ff410d3abf571895c73af14a1977ea2b44f9aab917f7d6df6cf172187f40e13faaaab095ff659b5ef17457ce315c7af8de60bf50e599048d2cac4a24";
+      sha512 = "516342913ad7e38f0f4ee2baeeb5cb0640a46d9aaa0d0f4fb9d0762cabb88639efaabe158bbdf1a22afed05f99b77271cb5e432eed2ff606f79fdb754d5a553e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sl/firefox-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "aa81792a46431668d7c73c937e88997adc1fc79f570d1984d48ef328ba2543aa4e3b0bba83084cad75c911566e762d8f6c689bd938367ce5940bef52fb218823";
+      sha512 = "239c2137bf2b2f873874f5d58d245179b55687e69f6d170c2f6d2acdfd90d0cc1a95383ea2a03de2a6a93dae6145651fbc18aefaf4a34ffbafdb9fb6fd30b7f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/son/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/son/firefox-52.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "db4e58058f5a96ff86716a94ac5cfd08d286770560ce9d2dd0b4e66c2b2cb2de49044d0add4e47afea815910435b89c4ded953d4c8908bcf2bd0b006d8eb2e1e";
+      sha512 = "a4f896919679ae68abace99a38a44b0b4c97ec190fd076fb732c5f4fdaf37dcebc0ba8d8ce79273fc1118f010bdefb304a6d1d6de0aecd7404795d31501af511";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sq/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sq/firefox-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "412b08900c697b8aacca05a0e8e972d5f8a94c659fcb43883ee53e5e70ebefa6ef96ae25b7053bc0652a1600b2fc552effa62add6ad126a2ff00614b7c956873";
+      sha512 = "9cab63ca40a6389d55ea3cc3fed3efb545784f7f3a257b79f440b72ac891e800f52aaf02e732ad2ecf99aa1810db7b88900f1f6b77cb2c6d2daa3a61210df62e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sr/firefox-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "2a6d6d5c4d8215b08e0de5f85c9bb20df27975a27ef81f7706c78d6315fa73adb99b7676237463d73a376ebfe1960702291b38100e9035d4f9961270e07a5a50";
+      sha512 = "22ac168005c7675d32f2e9524d0356e2de305289dffd0be60334663adbcab48584fdf1dc0990381561aca65711d01b4b007546152d30716fec97bf1486fb788d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sv-SE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sv-SE/firefox-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6c12add3fc10a2bba6603418662e02331d6266a4df5b05a25a921f5da3f5235366e7114dabf2cd8d41b27b43932f14ebfdf10d30baea9b065a1d6a419ec887ec";
+      sha512 = "a958aebdaaf7737000a4a6ce7d86b299287bdcfa810a230334ace7a25a277cb17193d373d54724dfb5acf64e78e3c573d2d0c2ce0921ca545e133bfdb20c167d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ta/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ta/firefox-52.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "63532f2d237a8533ce87872e939cab06345cafb7e51488972c51f9a63f16bcc768d21a13574b798bf09ae9412b827f95cf3acda33a08082e764a9fbbc026a044";
+      sha512 = "107e51b9990dd0438d6fd45fe02582474f5c14dc3a07a8fa2598cca25cacedcf7f7580f8f80c7094eeb7af9cfbda125d469d4da4c2091d8d7a6ae0eeb80fdbc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/te/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/te/firefox-52.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "42a37106d3921dbc65dd4ef1729513c6bc97cb9b0a7412c44223d07b49b5b2d48b3275fff1454cc022935d32741a434fbc45387a2151629c24f832a04b9baee8";
+      sha512 = "13f611011ee3c82df3aca2dfa4e6c4edf933bebe394f162e30af7c5bd27db3e141fdbb34e3491130605c6af9913a2a95d41d2b3a74cc4f31264e0bc7893bdb45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/th/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/th/firefox-52.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6707469f29aad81f15e9522e49373b39988598f40ad4e4afee0fcdee9551e66aa74d94d31268fa0fb62f7ef69f6eda177d7b30408691af694ad6475db30c5612";
+      sha512 = "f7d474dbd9cec1c84406ff1f56249896c37e0d7f4c2e7b513dae1e2d2f1278c88cdfa56dd291e4d63746060f0d8e9a71d34f4e5b3004165b70e274e5bfa7e1b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/tr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/tr/firefox-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6c6ecc7d4fcbb967217b1c174a993b711485eec530cbc171d64b9f777b867b4ee1a6e17ea3fe054fa3c1e6255c28c3ffcdc3beccd28546977714f0d5cada7871";
+      sha512 = "51a785b556800301ad6a3dde8fee0606d74f00bab1b75fe188d83cfba67a4de2dde402e542cef62eae04059217d5e5acf29f62691c03d4e024f85264778872aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uk/firefox-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "d7cd7d0b100ad257c92444d9637e924d5900b9b99f04e205149e79e59c757fae741ec3f6cd01842efe1c7f219c594cece5d7a9345925a8765ee4d3245afe5215";
+      sha512 = "76f12345ce05edfebd0c5c14b894a0affdcae45899c46a229eeff1930bbd1302f7e1d80f007f0e3b831d8b1460b86a7f607924c24c39160768cf254825178a39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uz/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uz/firefox-52.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c1ded0aa9b6975a71b5132349521f745648bd2cf74aacf71764120cfb5c663ffc23615e62bfa662feab8c6e8c2cc40f8d0bc5b707c8cf7619de9b712d893a7f9";
+      sha512 = "7d6ec5c13514721741cfb569769137ea28516279b494b77fc066be89ebdef629d5c15f878ad62d794e5c1e345bc8e2851dbdfb9575f09c8d848d1a61c638463a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/vi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/vi/firefox-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "fd19f568b5467df2f92ffb4367bbac35ff36979c875847433da573cee0f6fc24cac1c538e197a53c1a920bc274e4715a3f3734df131fc00ae8972b1a14218418";
+      sha512 = "c27e0109761f2199c7013abbd206abb24bc33a60d1b87f39ca50a05fc44c4436507b94cf72c7cac9dd30ee0613bf2b32b27272878a446185166f3c83e35ca1db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/xh/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/xh/firefox-52.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "58d10220a9ae70cddd7e814071a57f944654edd58abf8dba6a083a9de0d6b1887f09e3e6756896ca65d49622dd2981dc7abafdb655187650b7aff7023b87c60d";
+      sha512 = "8c46324dd71f3ef17e998911100c451701fdcbecc460facffd1ea43074ceec54b1b84070168496ef38706fd52a69306de76709ba100214c3c9d11252c1fe7d9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-CN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-CN/firefox-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "59fd16400cde462fc339e5df5dd8c21dcea02cc8d46268ee01566d0a5e3188d51bb71ece2516fa2ca141b8f93fe35aa97af92841f0a7211760708f01d5cbcc36";
+      sha512 = "6bb1e84bdea7b61ac4cc4b145478a167993bc843a4171d97bc9f6a06969eee72f527c25f3b2add2ba5341aa1aa5995b3cfe6d691a4e1ed315cec0df522911313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-TW/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-TW/firefox-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f288f83fc827221d46e656c5217e16b2fe23d1d9cde279ccf64824ded9135c4ea0ea3d3657a22aaab6e42f679a7c1040fe5de0875f57ae568712f1e6287177b1";
+      sha512 = "172364ccbacf6918571440cb9910eabb43457deba65449d95adfff550ac3d56b3118d21f862050a6df97ff173f079e8f2c48b41a01ec160da263bf7903c737b3";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 71e8d056ebe..96b62fc0d02 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -152,8 +152,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "52.0";
-    sha512 = "bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7";
+    version = "52.0.1";
+    sha512 = "535e2cc0ee645d4ebe9f1d2d1f4fbb16ff5d1745ce493add6b2e323ca3b0907c3054705c5a15eaadb314d5d6474ba1825554fd1ff0780ab7f76fd3f9672a6974";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;

From a038f918714efbb67b27574dff93b632f50c916e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 18 Mar 2017 09:36:27 +0900
Subject: [PATCH 105/110] firefox-esr: 52.0esr -> 52.0.1esr

---
 pkgs/applications/networking/browsers/firefox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 96b62fc0d02..66004787542 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -162,8 +162,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "52.0esr";
-    sha512 = "7e191c37af98163131cbba4dcc820a4edc0913d81c3b2493d9aad0a2886e7aed41a990fa5281ccfb08566ecfdfd7df7353063a01ad92d2ec6e1ce19d277b6e67";
+    version = "52.0.1esr";
+    sha512 = "c1f0aea279254e7788f62bba7892840edd2b667f385a649d374c9e783b93ec7faf9e5ebfccd04cd94f46da37aeb6bd7785d17faca2ad441a0b6e8587917faab2";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";

From a4d6e2cf163202b438b2b1af732fa47ea5db5cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 18 Mar 2017 01:39:14 +0100
Subject: [PATCH 106/110] atom: avoid using LD_PRELOAD. Fixes glibc compat
 issues

The wrapper for Atom was loading libraries via LD_PRELOAD, for example
libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
nixpkgs for that than what your system environment is build against, you could
end up with an error like this:

```
uname: relocation error:
/nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
with link time reference
```

This happens because atom calls the `uname` executable from the system to
determine the platform. Because that inherits the `LD_PRELOAD` environment
variable, so the libxkbfile library that the `atom` wrapper was build against
is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
it was built with might be compiled against a newer version of `glibc` than
`uname`, which comes from the system, was! Having two versions of glibc loaded
into the same processes results in chaos.

To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
correct RPATH. RPATH is not inherited by child processes, so the above issue
can no longer occur.

The only small complication here is that the library that actually loads
libxkbfile is not the atom binary itself, but a node extension that atom uses.
So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
node extensions (`*.node`) the output.
---
 pkgs/applications/editors/atom/default.nix | 9 +++++----
 pkgs/applications/editors/atom/env.nix     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 3eae877ff61..60e17982b5b 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }:
+{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
     rm -r $out/share/lintian
     rm -r $out/usr/
     wrapProgram $out/bin/atom \
-      --prefix "PATH" : "${gvfs}/bin" \
-      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
-      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1
+      --prefix "PATH" : "${gvfs}/bin"
 
     fixupPhase
 
@@ -33,8 +31,11 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
+
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
+
+    find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 1285e46fb48..228a21dc430 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -9,7 +9,7 @@ let
     fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-    xorg.libXcursor libcap systemd libnotify
+    xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
   ];
 
   libPathNative = lib.makeLibraryPath packages;

From 8ef05d30105ae875429a3631bd4cfcf13286f338 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 20:02:23 -0500
Subject: [PATCH 107/110] mpop: 1.2.4 -> 1.2.6

---
 pkgs/applications/networking/mpop/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index b2cc30b6f1f..3d0d576bffb 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -1,24 +1,27 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  version = "1.2.4";
+  version = "1.2.6";
   name = "mpop-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpop/${name}.tar.xz";
-    sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk";
+    sha256 = "0p1ix63jh64dibrlccch8q7gxl9nn18wd2qpyr5z1h4gs2fpmv4z";
   };
 
-  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl gnutls gsasl libidn ]
+    ++ optional stdenv.isDarwin Security;
 
   configureFlags =
-    stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
+    optional stdenv.isDarwin [ "--with-macosx-keyring" ];
 
   meta = {
       description = "POP3 mail retrieval agent";
-      homepage = "http://mpop.sourceforge.net/";
-      license = stdenv.lib.licenses.gpl3Plus;
-      platforms = stdenv.lib.platforms.unix;
+      homepage = http://mpop.sourceforge.net/;
+      license = licenses.gpl3Plus;
+      platforms = platforms.unix;
     };
 }

From 17bfb6a08a0f77124bbe96e2908076c821bdeb46 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Mar 2017 02:04:28 +0000
Subject: [PATCH 108/110] citrix-receiver: add link to webpage with all
 versions and adjust to change in nix-prefetch-url

Helps with #23975
---
 .../networking/remote/citrix-receiver/default.nix             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 57d04e52845..cf7afc37b8b 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
 
       ${homepage}
 
+      (if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/)
+
       Once you have downloaded the file, please use the following command and re-run the
       installation:
 
-      nix-prefetch-url file://${name}
+      nix-prefetch-url file://$PWD/${name}
     '';
   };
 

From ee20e8964429288df5f8186c4d6b0771633be86d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 18 Mar 2017 12:32:49 +0800
Subject: [PATCH 109/110] virtmanager-qt: 0.39.60 -> 0.42.67

---
 pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index d502ef06671..1952102e71a 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.39.60";
+  version = "0.42.67";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "010lpw85m5sd613l281y4zxkp5v3k16pgnawskbi1ricsnj4k5mh";
+    sha256 = "0hskaffc84wf8h9qck5xg840jw8x2krfy6cw4hqnq946z9lbyanr";
   };
 
   cmakeFlags = [

From f77ae4e72607a658bdfd117b7e6f32aa4504befc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Mar 2017 09:36:08 +0100
Subject: [PATCH 110/110] amule: 2.3.1 -> 2.3.2

---
 pkgs/tools/networking/p2p/amule/default.nix |  6 +++---
 pkgs/tools/networking/p2p/amule/gcc47.patch | 21 ---------------------
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/amule/gcc47.patch

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index d091af62446..c278cc98935 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -13,11 +13,11 @@ let
   edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
 in
 mkDerivation rec {
-  name = "aMule-2.3.1";
+  name = "aMule-2.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/amule/${name}.tar.xz";
-    sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
+    sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
   };
 
   buildInputs =
@@ -25,7 +25,7 @@ mkDerivation rec {
     ++ lib.optional httpServer libpng
     ++ lib.optional client libX11;
 
-  patches = [ ./gcc47.patch ]; # from Gentoo
+  enableParallelBuilding = true;
 
   configureFlags = ''
     --with-crypto-prefix=${cryptopp}
diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch
deleted file mode 100644
index e776dda3240..00000000000
--- a/pkgs/tools/networking/p2p/amule/gcc47.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# http://code.google.com/p/amule/source/detail?r=10772
-diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
---- aMule-2.3.1.orig//src/ObservableQueue.h	2012-04-22 19:40:05.560084120 +0200
-+++ aMule-2.3.1/src/ObservableQueue.h	2012-04-22 19:40:32.479085322 +0200
-@@ -331,14 +331,14 @@
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STARTING ), o );
-+	this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
- 
- 
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STOPPING ), o );
-+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
- 
- 
\ No newline at end of file