From 91154416b650e7a09c44b0c0d97399bc5c849117 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Nov 2017 18:59:27 +0100
Subject: [PATCH 01/78] docs: clarify package and module option naming

This attempts to briefly clarify the current naming conventions of
attribute names in `all-packages.nix` and module option names.
---
 doc/coding-conventions.xml                    | 25 ++++++++++---------
 .../development/option-declarations.xml       |  9 +++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 0776e70f14e1..ec81c968e4a4 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -18,9 +18,9 @@
   tab settings so it’s asking for trouble.</para></listitem>
 
   <listitem><para>Use <literal>lowerCamelCase</literal> for variable
-  names, not <literal>UpperCamelCase</literal>.  TODO: naming of
-  attributes in
-  <filename>all-packages.nix</filename>?</para></listitem>
+  names, not <literal>UpperCamelCase</literal>.  Note, this rule does
+  not apply to package attribute names, which instead follow the rules
+  in <xref linkend="sec-package-naming"/>.</para></listitem>
 
   <listitem><para>Function calls with attribute set arguments are
   written as
@@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // {
 
   <listitem><para>The variable name used for the instantiated package
   in <filename>all-packages.nix</filename>, and when passing it as a
-  dependency to other functions.  This is what Nix expression authors
-  see.  It can also be used when installing using <command>nix-env
-  -iA</command>.</para></listitem>
+  dependency to other functions.  Typically this is called the
+  <emphasis>package attribute name</emphasis>.  This is what Nix
+  expression authors see.  It can also be used when installing using
+  <command>nix-env -iA</command>.</para></listitem>
 
   <listitem><para>The filename for (the directory containing) the Nix
   expression.</para></listitem>
@@ -259,12 +260,12 @@ bound to the variable name <varname>e2fsprogs</varname> in
   Also append <literal>"unstable"</literal> to the name - e.g.,
   <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>
 
-  <listitem><para>Dashes in the package name should be preserved
-  in new variable names, rather than converted to underscores
-  (which was convention up to around 2013 and most names
-   still have underscores instead of dashes) — e.g.,
-  <varname>http-parser</varname> instead of
-  <varname>http_parser</varname>.</para></listitem>
+  <listitem><para>Dashes in the package name should be preserved in
+  new variable names, rather than converted to underscores or camel
+  cased — e.g., <varname>http-parser</varname> instead of
+  <varname>http_parser</varname> or <varname>httpParser</varname>.  The
+  hyphenated style is preferred in all three package
+  names.</para></listitem>
 
   <listitem><para>If there are multiple versions of a package, this
   should be reflected in the variable names in
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index be793152f9ef..ed718c89eb77 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -22,6 +22,15 @@ options = {
 };
 </programlisting>
 
+The attribute names within the <replaceable>name</replaceable>
+attribute path must be camel cased in general but should, as an
+exception, match the
+<link
+xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
+package attribute name</link> when referencing a Nixpkgs package. For
+example, the option <varname>services.nix-serve.bindAddress</varname>
+references the <varname>nix-serve</varname> Nixpkgs package.
+
 </para>
 
 <para>The function <varname>mkOption</varname> accepts the following arguments.

From bccab965b9226e7d515e1ee1cdf47bb32d1df63d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 7 Dec 2017 21:26:30 +0000
Subject: [PATCH 02/78] lib: implement `compare`, `splitByAndCompare`, and
 `compareLists`

---
 lib/default.nix |  6 +++---
 lib/lists.nix   | 24 ++++++++++++++++++++++++
 lib/trivial.nix | 25 +++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 9dc4fea99fc2..eb19dc06ce80 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,7 +56,7 @@ let
       replaceStrings seq stringLength sub substring tail;
     inherit (trivial) id const concat or and boolToString mergeAttrs
       flip mapNullable inNixShell min max importJSON warn info
-      nixpkgsVersion mod;
+      nixpkgsVersion mod compare splitByAndCompare;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
@@ -71,8 +71,8 @@ let
     inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
-      reverseList listDfs toposort sort take drop sublist last init
-      crossLists unique intersectLists subtractLists
+      reverseList listDfs toposort sort compareLists take drop sublist
+      last init crossLists unique intersectLists subtractLists
       mutuallyExclusive;
     inherit (strings) concatStrings concatMapStrings concatImapStrings
       intersperse concatStringsSep concatMapStringsSep
diff --git a/lib/lists.nix b/lib/lists.nix
index 8f67c6bb0ca3..f7e09040a5aa 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -385,6 +385,30 @@ rec {
       if len < 2 then list
       else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right));
 
+  /* Compare two lists element-by-element.
+
+     Example:
+       compareLists compare [] []
+       => 0
+       compareLists compare [] [ "a" ]
+       => -1
+       compareLists compare [ "a" ] []
+       => 1
+       compareLists compare [ "a" "b" ] [ "a" "c" ]
+       => 1
+  */
+  compareLists = cmp: a: b:
+    if a == []
+    then if b == []
+         then 0
+         else -1
+    else if b == []
+         then 1
+         else let rel = cmp (head a) (head b); in
+              if rel == 0
+              then compareLists cmp (tail a) (tail b)
+              else rel;
+
   /* Return the first (at most) N elements of a list.
 
      Example:
diff --git a/lib/trivial.nix b/lib/trivial.nix
index c452c7b65bc1..5f18c0b61cc0 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -81,6 +81,31 @@ rec {
   */
   mod = base: int: base - (int * (builtins.div base int));
 
+  /* C-style comparisons
+
+     a < b  => -1
+     a == b => 0
+     a > b  => 1
+  */
+  compare = a: b:
+    if a < b
+    then -1
+    else if a > b
+         then 1
+         else 0;
+
+  /* Split type into two subtypes by predicate `p`, assume
+
+       forall x y . x < y if p x == true && p y == false
+
+     compare elements of the same subtype with `yes` and `no`
+     comparisons respectively.
+  */
+  splitByAndCompare = p: yes: no: a: b:
+    if p a
+    then if p b then yes a b else -1
+    else if p b then 1 else no a b;
+
   /* Reads a JSON file. */
   importJSON = path:
     builtins.fromJSON (builtins.readFile path);

From 182463dc79bb8dd4ca09ae54e8fcc1637d501c6a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 20 Apr 2016 21:46:02 +0000
Subject: [PATCH 03/78] nixos/doc: push all the `enable*' and `package*`
 options to the top of their option group

Why? Because this way configuration.nix(5) can be read linearly.

Before:

> virtualisation.xen.bootParams
> ...
> virtualisation.xen.enable
> ...
> virtualisation.xen.package
> ...

After:

> virtualisation.xen.enable
> virtualisation.xen.package
> virtualisation.xen.bootParams
> ...
---
 nixos/doc/manual/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 9bc83be66104..9a96f201a397 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -32,8 +32,22 @@ let
   prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
   stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
 
+  # Custom "less" that pushes up all the things ending in ".enable*"
+  # and ".package"
+  optionListLess = a: b:
+    let
+      splt = lib.splitString ".";
+      ise = lib.hasPrefix "enable";
+      isp = lib.hasPrefix "package";
+      cmp = lib.splitByAndCompare ise lib.compare
+                                 (lib.splitByAndCompare isp lib.compare lib.compare);
+    in lib.compareLists cmp (splt a) (splt b) < 0;
+
+  # Customly sort option list for the man page.
+  optionsList'' = lib.sort (a: b: optionListLess a.name b.name) optionsList';
+
   # Convert the list of options into an XML file.
-  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');
+  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'');
 
   optionsDocBook = runCommand "options-db.xml" {} ''
     optionsXML=${optionsXML}

From 67ec6371d5d38224f10432dcf4d10eacd85cc13b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 20 Apr 2016 21:57:33 +0000
Subject: [PATCH 04/78] nixos, lib: implement relatedPackages option

This allows one to specify "related packages" in NixOS that get rendered into
the configuration.nix(5) man page. The interface philosophy is pretty much
stolen from TeX bibliography.
---
 lib/options.nix                         |  9 +++++----
 nixos/doc/manual/default.nix            | 18 ++++++++++++++++--
 nixos/doc/manual/options-to-docbook.xsl |  9 +++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 769d3cc55723..ab1201c718a0 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -14,6 +14,7 @@ rec {
     , defaultText ? null # Textual representation of the default, for in the manual.
     , example ? null # Example value used in the manual.
     , description ? null # String describing the option.
+    , relatedPackages ? null # Related packages used in the manual.
     , type ? null # Option type, providing type-checking and value merging.
     , apply ? null # Function that converts the option value to something else.
     , internal ? null # Whether the option is for NixOS developers only.
@@ -76,7 +77,6 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
-
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
@@ -93,9 +93,10 @@ rec {
           readOnly = opt.readOnly or false;
           type = opt.type.description or null;
         }
-        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
-        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
-        // (if opt ? defaultText then { default = opt.defaultText; } else {});
+        // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
+        // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
+        // optionalAttrs (opt ? defaultText) { default = opt.defaultText; }
+        // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; };
 
         subOptions =
           let ss = opt.type.getSubOptions opt.loc;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 9a96f201a397..95363c2458f5 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -15,13 +15,27 @@ let
     else if builtins.isFunction x then "<function>"
     else x;
 
-  # Clean up declaration sites to not refer to the NixOS source tree.
+  # Generate DocBook documentation for a list of packages
+  genRelatedPackages = packages:
+    let
+      unpack = p: if lib.isString p then { name = p; } else p;
+      describe = { name, package ? pkgs.${name}, comment ? "" }:
+          "<listitem>"
+        + "<para><option>pkgs.${name}</option> (${package.name}): ${package.meta.description or "???"}.</para>"
+        + lib.optionalString (comment != "") "\n<para>${comment}</para>"
+        # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting>
+        + lib.optionalString (package.meta ? longDescription) "\n<programlisting>${package.meta.longDescription}</programlisting>"
+        + "</listitem>";
+    in "<itemizedlist>${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}</itemizedlist>";
+
   optionsList' = lib.flip map optionsList (opt: opt // {
+    # Clean up declaration sites to not refer to the NixOS source tree.
     declarations = map stripAnyPrefixes opt.declarations;
   }
   // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; }
-  // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; });
+  // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }
+  // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; });
 
   # We need to strip references to /nix/store/* from options,
   # including any `extraSources` if some modules came from elsewhere,
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 5387546b5982..7b45b233ab2a 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -70,6 +70,15 @@
                 </para>
               </xsl:if>
 
+              <xsl:if test="attr[@name = 'relatedPackages']">
+                <para>
+                  <emphasis>Related packages:</emphasis>
+                  <xsl:text> </xsl:text>
+                  <xsl:value-of disable-output-escaping="yes"
+                                select="attr[@name = 'relatedPackages']/string/@value" />
+                </para>
+              </xsl:if>
+
               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
                 <para>
                   <emphasis>Declared by:</emphasis>

From f56b5824ad06cd03ebd1d1b9cf11a8db30dccb09 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 7 Dec 2017 21:26:36 +0000
Subject: [PATCH 05/78] nixos/tmux: use related packages

---
 nixos/modules/programs/tmux.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index ed1d88a420a2..967001845f02 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -61,7 +61,12 @@ in {
   options = {
     programs.tmux = {
 
-      enable = mkEnableOption "<command>tmux</command> - a <command>screen</command> replacement.";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whenever to configure <command>tmux</command> system-wide.";
+        relatedPackages = [ "tmux" ];
+      };
 
       aggressiveResize = mkOption {
         default = false;

From 7a92c2074dd6b003f3708db3de99b577e3b1f303 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 7 Dec 2017 21:26:42 +0000
Subject: [PATCH 06/78] xen, qemu: passthru the path to qemu-system-i386

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++++
 pkgs/applications/virtualization/xen/4.5.nix      | 6 ++++++
 pkgs/applications/virtualization/xen/4.8.nix      | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 2488bb1ae10e..b959832c9896 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -106,6 +106,10 @@ stdenv.mkDerivation rec {
       fi
     '';
 
+  passthru = {
+    qemu-system-i386 = "bin/qemu-system-i386";
+  };
+
   meta = with stdenv.lib; {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 308913adf89c..9a2ed6ee66b5 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -242,4 +242,10 @@ callPackage (import ./generic.nix (rec {
       -i tools/libxl/libxl_device.c
   '';
 
+  passthru = {
+    qemu-system-i386 = if withInternalQemu
+      then "lib/xen/bin/qemu-system-i386"
+      else throw "this xen has no qemu builtin";
+  };
+
 })) ({ ocamlPackages = ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 259dd72a960c..bf4892ee3811 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -170,4 +170,10 @@ callPackage (import ./generic.nix (rec {
       -i tools/libxl/libxl_device.c
   '';
 
+  passthru = {
+    qemu-system-i386 = if withInternalQemu
+      then "lib/xen/bin/qemu-system-i386"
+      else throw "this xen has no qemu builtin";
+  };
+
 })) args

From 3be0e1bd728f2500f1e8543ebc121d3ba9dabb4d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 7 Dec 2017 21:26:49 +0000
Subject: [PATCH 07/78] nixos/xen-dom0: add related packages, make it play well
 with them

---
 nixos/modules/rename.nix                  |  4 ++++
 nixos/modules/virtualisation/xen-dom0.nix | 25 +++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index eb10d4f428be..59c44f9f7f25 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -203,6 +203,7 @@ with lib;
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+    (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
@@ -213,5 +214,8 @@ with lib;
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
+
+    # Xen
+    (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
   ];
 }
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index c7656bc309c0..afc5a42f8b4e 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -35,24 +35,19 @@ in
       description = ''
         The package used for Xen binary.
       '';
+      relatedPackages = [ "xen" "xen-light" ];
     };
 
-    virtualisation.xen.qemu = mkOption {
-      type = types.path;
-      defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
-      example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
-      description = ''
-        The qemu binary to use for Dom-0 backend.
-      '';
-    };
-
-    virtualisation.xen.qemu-package = mkOption {
+    virtualisation.xen.package-qemu = mkOption {
       type = types.package;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.qemu_xen-light";
       description = ''
-        The package with qemu binaries for xendomains.
+        The package with qemu binaries for dom0 qemu and xendomains.
       '';
+      relatedPackages = [ "xen"
+                          { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; }
+                        ];
     };
 
     virtualisation.xen.bootParams =
@@ -158,8 +153,7 @@ in
     } ];
 
     virtualisation.xen.package = mkDefault pkgs.xen;
-    virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
-    virtualisation.xen.qemu-package = mkDefault pkgs.xen;
+    virtualisation.xen.package-qemu = mkDefault pkgs.xen;
     virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
 
     environment.systemPackages = [ cfg.package ];
@@ -339,7 +333,8 @@ in
       after = [ "xen-console.service" ];
       requires = [ "xen-store.service" ];
       serviceConfig.ExecStart = ''
-        ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
+        ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \
+           -xen-attach -xen-domid 0 -name dom0 -M xenpv \
            -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
         '';
     };
@@ -448,7 +443,7 @@ in
       before = [ "dhcpd.service" ];
       restartIfChanged = false;
       serviceConfig.RemainAfterExit = "yes";
-      path = [ cfg.package cfg.qemu-package ];
+      path = [ cfg.package cfg.package-qemu ];
       environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains";
       preStart = "mkdir -p /var/lock/subsys -m 755";
       serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start";

From d4ed769925f51fd3872b00719c560f4fe51d8eb9 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 15 Dec 2017 02:06:45 +0000
Subject: [PATCH 08/78] SkypeExport: init at 1.4.0

---
 .../SkypeExport/default.nix                   | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/SkypeExport/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
new file mode 100644
index 000000000000..9ec9a3451bef
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, boost }:
+
+stdenv.mkDerivation rec {
+  name = "SkypeExport-${version}";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Temptin";
+    repo = "SkypeExport";
+    rev = "v${version}";
+    sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost ];
+
+  preConfigure = "cd src/SkypeExport/_gccbuild/linux";
+  installPhase = "install -Dt $out/bin SkypeExport";
+
+  meta = with stdenv.lib; {
+    description = "Export Skype history to HTML";
+    homepage = https://github.com/Temptin/SkypeExport;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ yegortimoshenko ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e7a56bd75da..da456dc3b3cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16686,6 +16686,8 @@ with pkgs;
 
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
 
+  SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { };
+
   slmenu = callPackage ../applications/misc/slmenu {};
 
   slop = callPackage ../tools/misc/slop {};

From 8278df916dde49d50cef8396458c18a688e40c13 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Dec 2017 18:10:30 +0000
Subject: [PATCH 09/78] ocamlPackages.psq: init at 0.1.0

psq provides a functional priority search queue for OCaml.

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

diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix
new file mode 100644
index 000000000000..fc3fa81a02a9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/psq/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "psq is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-psq-${version}";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";
+    sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp";
+  };
+
+  unpackCmd = "tar -xjf $curSrc";
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    description = "Functional Priority Search Queues for OCaml";
+    homepage = "https://github.com/pqwy/psq";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.isc;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 215dfd6d6038..a9f1dfab633d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -500,6 +500,8 @@ let
     piqi = callPackage ../development/ocaml-modules/piqi { };
     piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
 
+    psq = callPackage ../development/ocaml-modules/psq { };
+
     ptime = callPackage ../development/ocaml-modules/ptime { };
 
     re2_p4 = callPackage ../development/ocaml-modules/re2 { };

From 14608047f42066db72229b232debf9aec26e49ee Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Dec 2017 18:12:56 +0000
Subject: [PATCH 10/78] ocamlPackages.lru: init at 0.2.0

lru provides LRU caches for OCaml.

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

diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix
new file mode 100644
index 000000000000..3e474c5653a7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lru/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, psq }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-lru-${version}";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";
+    sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0";
+  };
+
+  unpackCmd = "tar -xjf $curSrc";
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
+
+  propagatedBuildInputs = [ psq ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    homepage = "https://github.com/pqwy/lru";
+    description = "Scalable LRU caches for OCaml";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.isc;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a9f1dfab633d..5bc0398e90df 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -349,6 +349,8 @@ let
       lwt = ocaml_lwt;
     };
 
+    lru = callPackage ../development/ocaml-modules/lru { };
+
     lwt2 = callPackage ../development/ocaml-modules/lwt { };
 
     lwt3 = if lib.versionOlder "4.02" ocaml.version

From 3582a974646f96da553775a5afc9f4796005c577 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Dec 2017 18:16:19 +0000
Subject: [PATCH 11/78] ocamlPackages.faraday: init at 0.5.0

Faraday is a library for writing fast and memory-efficient serializers in
OCaml.

Homepage: https://github.com/inhabitedtype/faraday
---
 .../ocaml-modules/faraday/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/faraday/default.nix

diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
new file mode 100644
index 000000000000..8f30ec519777
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "faraday is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-faraday-${version}";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "inhabitedtype";
+    repo = "faraday";
+    rev = version;
+    sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
+  };
+
+  buildInputs = [ ocaml findlib jbuilder alcotest ];
+
+  buildPhase = "jbuilder build -p faraday";
+
+  doCheck = true;
+  checkPhase = "jbuilder runtest";
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    description = "Serialization library built for speed and memory efficiency";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5bc0398e90df..b83e77627efb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -231,6 +231,8 @@ let
 
     faillib = callPackage ../development/ocaml-modules/faillib { };
 
+    faraday = callPackage ../development/ocaml-modules/faraday { };
+
     fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };
 
     fileutils = callPackage ../development/ocaml-modules/fileutils { };

From 8a5d33ed527e16d458f323331e935ac74517f361 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Dec 2017 18:17:54 +0000
Subject: [PATCH 12/78] ocamlPackages.farfadet: init at 0.2

Farfadet is a printf-like for Faraday library.

Homepage: https://github.com/oklm-wsh/Farfadet
---
 .../ocaml-modules/farfadet/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/farfadet/default.nix

diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix
new file mode 100644
index 000000000000..080cc74998df
--- /dev/null
+++ b/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
+, faraday
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.3"
+then throw "farfadet is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-farfadet-${version}";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
+    sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
+  };
+
+  unpackCmd = "tar -xjf $curSrc";
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
+
+  propagatedBuildInputs = [ faraday ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    description = "A printf-like for Faraday library";
+    homepage = "https://github.com/oklm-wsh/Farfadet";
+    license = stdenv.lib.licenses.mit;
+    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 b83e77627efb..7fd18a664637 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -233,6 +233,8 @@ let
 
     faraday = callPackage ../development/ocaml-modules/faraday { };
 
+    farfadet = callPackage ../development/ocaml-modules/farfadet { };
+
     fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };
 
     fileutils = callPackage ../development/ocaml-modules/fileutils { };

From d39886db5a26d813aebfecb07f196f1d9bca26da Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Dec 2017 18:19:25 +0000
Subject: [PATCH 13/78] ocamlPackages.digestif: init at 0.5

Digestif provides some hash functions in OCaml.

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

diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix
new file mode 100644
index 000000000000..cf8b5335d594
--- /dev/null
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.3"
+then throw "digestif is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-digestif-${version}";
+  version = "0.5";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz";
+    sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd";
+  };
+
+  unpackCmd = "tar -xjf $curSrc";
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    description = "Simple hash algorithms in OCaml";
+    homepage = "https://github.com/mirage/digestif";
+    license = stdenv.lib.licenses.mit;
+    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 7fd18a664637..bab1e08ab8eb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -200,6 +200,8 @@ let
 
     decompress =  callPackage ../development/ocaml-modules/decompress { };
 
+    digestif =  callPackage ../development/ocaml-modules/digestif { };
+
     dolmen =  callPackage ../development/ocaml-modules/dolmen { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From 0d85bddd06f5921ccdf9684623bf71a5b501ee89 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Tue, 19 Dec 2017 22:06:05 +0200
Subject: [PATCH 14/78] rust-bindgen: 0.31.1 -> 0.32.1

---
 pkgs/development/tools/rust/bindgen/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index d304560515c4..73e64c83696d 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.31.1";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
-    rev = "v${version}";
-    sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i";
+    rev = version;
+    sha256 = "15m1y468c7ixzxwx29wazag0i19a3bmzjp53np6b62sf9wfzbsfa";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w";
+  cargoSha256 = "01h0y5phdv3ab8mk2yxw8lgg9783pjjnjl4087iddqhqanlv600d";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 

From 2bb24283ccd3773d21b06c62174436070a1ef595 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Tue, 19 Dec 2017 13:30:00 +0100
Subject: [PATCH 15/78] docker_compose: add darwin to platforms

---
 pkgs/development/python-modules/docker_compose/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix
index 91a0c4183c9b..78e733c1b9d8 100644
--- a/pkgs/development/python-modules/docker_compose/default.nix
+++ b/pkgs/development/python-modules/docker_compose/default.nix
@@ -41,7 +41,6 @@ buildPythonApplication rec {
     homepage = https://docs.docker.com/compose/;
     description = "Multi-container orchestration for Docker";
     license = licenses.asl20;
-    platforms = platforms.linux;
     maintainers = with maintainers; [
       jgeerds
     ];

From a0a692b3a30285b9615eb1da9745ca5119924044 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Dec 2017 14:13:35 +0100
Subject: [PATCH 16/78] gnome3.gnome_control_center: clean up

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 19141c40e710..9d20eb750ab9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -2,7 +2,7 @@
 , libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, librsvg, libnotify, libgudev
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
+, cracklib, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, libtool
 , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
 , fontconfig, sound-theme-freedesktop, grilo }:

From e6936dd556f2df2162b51dea30fc99532ce6f37f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Dec 2017 19:42:32 +0100
Subject: [PATCH 17/78] gnome3.gnome_keyring: clarify Python version & enable
 tests

---
 .../gnome-3/core/gnome-keyring/default.nix    | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 4baafecadd0a..6a6722c3b60f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
 , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
+, docbook_xsl, docbook_xml_dtd_42, gnome3 }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -8,21 +8,41 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
+    dbus libgcrypt pam gtk3 gconf libgnome_keyring
     pango gcr gdk_pixbuf atk p11_kit
   ];
 
+  # In 3.20.1, tests do not support Python 3
+  checkInputs = [ dbus python2 ];
+
   propagatedBuildInputs = [ glib libtasn1 libxslt ];
 
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ];
+  nativeBuildInputs = [
+    pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
+  ] ++ stdenv.lib.optionals doCheck checkInputs;
 
   configureFlags = [
     "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
 
+  postPatch = ''
+    patchShebangs build
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    export HOME=$(mktemp -d)
+    dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      make check
+  '';
+
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications";
+    homepage = https://wiki.gnome.org/Projects/GnomeKeyring;
+    license = licenses.gpl2;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }

From c6e9acc3eb5b3db7c8169ac2c127e6769e6ceac1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Dec 2017 19:49:07 +0100
Subject: [PATCH 18/78] gnome3.gnome_desktop: clean up

---
 .../desktops/gnome-3/core/gnome-desktop/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 68ec28e93b6e..99ff1b6f3a16 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
+{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
+, intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland
 , libseccomp, bubblewrap, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection
   ];
-  buildInputs = [ python libxml2Python libX11 bubblewrap
-                  xkeyboard_config isocodes wayland
-                  gtk3 glib libxkbfile libseccomp ];
+  buildInputs = [
+    libX11 bubblewrap xkeyboard_config isocodes wayland
+    gtk3 glib libseccomp
+  ];
 
   propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
 
@@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    description = "Library with common API for various GNOME modules";
+    license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
   };

From f5d7b05f1e5657addc526886dc6fa3a6918326be Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Dec 2017 23:43:00 +0100
Subject: [PATCH 19/78] gnome3.glade: enable libgladepython

---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index accd66933aad..8b198b9c8797 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, python
+{ stdenv, intltool, fetchurl, python3
 , pkgconfig, gtk3, glib, gobjectIntrospection
 , wrapGAppsHook, itstool, libxml2, docbook_xsl
 , gnome3, gdk_pixbuf, libxslt }:
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection
   ];
-  buildInputs = [ gtk3 glib libxml2 python
-                  gnome3.gsettings_desktop_schemas
-                  gdk_pixbuf gnome3.defaultIconTheme ];
+  buildInputs = [
+    gtk3 glib libxml2 python3 python3.pkgs.pygobject3
+    gnome3.gsettings_desktop_schemas
+    gdk_pixbuf gnome3.defaultIconTheme
+  ];
 
   enableParallelBuilding = true;
 

From 6002d1785d8d8b2e80078797f72c433f666fc00f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Dec 2017 00:00:04 +0100
Subject: [PATCH 20/78] gnome3.evolution_data_server: clean up

---
 .../core/evolution-data-server/default.nix    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index ebe740a2167c..f6ee457dc63f 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf
+{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
 , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true
 , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }:
@@ -6,21 +6,25 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ];
-  buildInputs = with gnome3;
-    [ glib libsoup libxml2 gtk gnome_online_accounts
-      (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata
-      icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk
-      libaccounts-glib json_glib ]
-    ++ stdenv.lib.optional valaSupport vala;
+  nativeBuildInputs = [
+    cmake pkgconfig intltool python3 gperf makeWrapper
+  ] ++ stdenv.lib.optional valaSupport vala;
+  buildInputs = with gnome3; [
+    glib libsoup libxml2 gtk gnome_online_accounts
+    gcr p11_kit libgweather libgdata libaccounts-glib json_glib
+    icu sqlite kerberos openldap webkitgtk
+  ];
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 
   # uoa irrelevant for now
-  cmakeFlags = [ "-DENABLE_UOA=OFF" ]
-                   ++ stdenv.lib.optionals valaSupport [
-                     "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
-                     "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
+  cmakeFlags = [
+    "-DENABLE_UOA=OFF"
+  ] ++ stdenv.lib.optionals valaSupport [
+    "-DENABLE_VALA_BINDINGS=ON"
+    "-DENABLE_INTROSPECTION=ON"
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF"
+  ];
 
   enableParallelBuilding = true;
 
@@ -33,8 +37,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    license = licenses.lgpl2;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
-
 }

From e2f76df64329110a0f38a4004574cec78cf48ca9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Dec 2017 00:04:20 +0100
Subject: [PATCH 21/78] gnome3.anjuta: clean up

---
 pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 9ff98c2825e6..4347f72cc5f6 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -1,14 +1,19 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python2, makeWrapper }:
+  itstool, python3, ncurses, makeWrapper }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
+  nativeBuildInputs = [
+    pkgconfig intltool itstool python3 makeWrapper
+    # Required by python3
+    ncurses
+  ];
+  buildInputs = [
+    flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+    gnome3.libgda gnome3.gtksourceview
     gnome3.gsettings_desktop_schemas
   ];
 
@@ -22,6 +27,7 @@ stdenv.mkDerivation rec {
     description = "Software development studio";
     homepage = http://anjuta.org/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [];
     platforms = platforms.linux;
   };
 }

From 7f0e2dde87751b4523914be5dbd3fbeaca373586 Mon Sep 17 00:00:00 2001
From: David Lebel <lebel@lebel.org>
Date: Thu, 21 Dec 2017 13:00:02 -0500
Subject: [PATCH 22/78] makemkv: 1.10.7 -> 1.10.8

---
 pkgs/applications/video/makemkv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index ae7625d1972a..1e890c24db1a 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.10.7";
+  ver = "1.10.8";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac";
+    sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654";
+    sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From cfa636c6461a6271761c04f1b1026970ccf71947 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Thu, 21 Dec 2017 17:14:13 -0600
Subject: [PATCH 23/78] remove network-uri-json from dont-distribute-packages

I've fixed the build issues with network-uri-json and uploaded the new
package to hackage.  This should be successful going forward.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 83deaec8d513..cda4f1b2e0b8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6881,7 +6881,6 @@ dont-distribute-packages:
   network-stream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-uri-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-voicetext:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]

From b513fc742038b50f348f30d6f833011630d20c04 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 21 Dec 2017 22:06:11 +0100
Subject: [PATCH 24/78] python.pkgs.voluptuous: init at 0.10.5

Needed by elasticsearch-curator.
---
 .../python-modules/voluptuous/default.nix     | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/voluptuous/default.nix

diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix
new file mode 100644
index 000000000000..250a0951d96c
--- /dev/null
+++ b/pkgs/development/python-modules/voluptuous/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "voluptuous";
+  version = "0.10.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
+  };
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "Voluptuous is a Python data validation library";
+    homepage = http://alecthomas.github.io/voluptuous/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91943c87fe69..2929145cf268 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23290,6 +23290,7 @@ EOF
 
   ephem = callPackage ../development/python-modules/ephem { };
 
+  voluptuous = callPackage ../development/python-modules/voluptuous { };
 });
 
 in fix' (extends overrides packages)

From f0c4bea507f5bd96e447d121b4eda1c7cfd26139 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 21 Dec 2017 23:38:57 +0000
Subject: [PATCH 25/78] python.pkgs.pyelasticsearch: delete

because it requires python.pkgs.elasticsearch 1.x.y, which is compatible only
with the ancient Elasticsearch 1.
---
 pkgs/top-level/python-packages.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2929145cf268..a13e291c6514 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14328,26 +14328,6 @@ in {
     };
   };
 
-  pyelasticsearch = buildPythonPackage (rec {
-    name = "pyelasticsearch-1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyelasticsearch/${name}.tar.gz";
-      sha256 = "18wp6llfjv6hvyhr3f6i8dm9wc5rf46wiqsfxwpvnf6mdrvk6xr7";
-    };
-
-    # Tests require a local instance of elasticsearch
-    doCheck = false;
-    propagatedBuildInputs = with self; [ elasticsearch six simplejson certifi ];
-    buildInputs = with self; [ nose mock ];
-
-    meta = {
-      description = "A clean, future-proof, high-scale API to elasticsearch";
-      homepage = https://pyelasticsearch.readthedocs.org;
-      license = licenses.bsd3;
-    };
-  });
-
   pyelftools = buildPythonPackage rec {
     pname = "pyelftools";
     version = "0.24";

From d513afcfc7850d0b3555eaad18f86c33f0865921 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 21 Dec 2017 22:07:26 +0100
Subject: [PATCH 26/78] python.pkgs.elasticsearch: 1.9.0 -> 6.0.0

---
 pkgs/top-level/python-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a13e291c6514..8bb43b011d32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4598,11 +4598,13 @@ in {
   edward = callPackage ../development/python-modules/edward { };
 
   elasticsearch = buildPythonPackage (rec {
-    name = "elasticsearch-1.9.0";
+    pname = "elasticsearch";
+    version = "6.0.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/elasticsearch/${name}.tar.gz";
-      sha256 = "091s60ziwhyl9kjfm833i86rcpjx46v9h16jkgjgkk5441dln3gb";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz";
     };
 
     # Check is disabled because running them destroy the content of the local cluster!
@@ -4619,7 +4621,6 @@ in {
     };
   });
 
-
   elasticsearchdsl = buildPythonPackage (rec {
     name = "elasticsearch-dsl-0.0.9";
 

From 85ee9df0e16935b742dfc6361f2461a31bc05ec7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 21 Dec 2017 22:09:41 +0100
Subject: [PATCH 27/78] python.pkgs.elasticsearch-curator: init at 5.4.1

---
 .../elasticsearch-curator/default.nix         | 65 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/python-modules/elasticsearch-curator/default.nix

diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix
new file mode 100644
index 000000000000..bbd2904fd9ee
--- /dev/null
+++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix
@@ -0,0 +1,65 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, click
+, certifi
+, voluptuous
+, pyyaml
+, elasticsearch
+, nosexcover
+, coverage
+, nose
+, mock
+, funcsigs
+} :
+
+buildPythonPackage rec {
+  pname   = "elasticsearch-curator";
+  version = "5.4.1";
+  name    = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bhiqa61h6bbrfp0aygwwchr785x281hnwk8qgnjhb8g4r8ppr3s";
+  };
+
+  # The integration tests require a running elasticsearch cluster.
+  postUnpackPhase = ''
+    rm -r test/integration
+  '';
+
+  propagatedBuildInputs = [
+    click
+    certifi
+    voluptuous
+    pyyaml
+    elasticsearch
+  ];
+
+  checkInputs = [
+    nosexcover
+    coverage
+    nose
+    mock
+    funcsigs
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/elastic/curator;
+    description = "Curate, or manage, your Elasticsearch indices and snapshots";
+    license = licenses.asl20;
+    longDescription = ''
+      Elasticsearch Curator helps you curate, or manage, your Elasticsearch
+      indices and snapshots by:
+
+      * Obtaining the full list of indices (or snapshots) from the cluster, as the
+        actionable list
+
+      * Iterate through a list of user-defined filters to progressively remove
+        indices (or snapshots) from this actionable list as needed.
+
+      * Perform various actions on the items which remain in the actionable list.
+    '';
+    maintainers = with maintainers; [ basvandijk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bb43b011d32..2970edf52293 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4643,6 +4643,8 @@ in {
     };
   });
 
+  elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
+
   entrypoints = callPackage ../development/python-modules/entrypoints { };
 
   enzyme = callPackage ../development/python-modules/enzyme {};

From e20def225f1df3cdc94fc447ec12c71743683f09 Mon Sep 17 00:00:00 2001
From: Rommel Martinez <ebzzry@ebzzry.io>
Date: Fri, 22 Dec 2017 10:55:55 +0800
Subject: [PATCH 28/78] pell: 0.0.3 -> 0.0.4

---
 pkgs/applications/misc/pell/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index ba3e63fd2f6a..d55c7a2af12b 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   pname = "pell";
-  version = "0.0.3";
+  version = "0.0.4";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
     repo = pname;
-    rev = "c25ddd257dd1d1481df5ccac0f99f6bee1ee1ebb";
-    sha256 = "0fharadbf63mgpmafs8d4k9h83jj9naxldp240xnc5gkna32a07y";
+    rev = "f251625ece6bb5517227970287119e7d2dfcea8b";
+    sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a";
   };
 
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share
     cp pell $out/bin
-    cp resources/notification.mp3 $out/share
+    cp resources/online.mp3 $out/share
+    cp resources/offline.mp3 $out/share
     chmod +x $out/bin/pell
   '';
 
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
     substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play "
     substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send "
-    substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3"
+    substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3"
+    substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3"
   '';
 
   meta = with stdenv.lib; {

From 1efed45ebe3f4636425259613b1fa982c92fa1cb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 22 Dec 2017 11:29:38 +0800
Subject: [PATCH 29/78] terragrunt: 0.13.0 -> 0.13.23

---
 .../networking/cluster/terragrunt/default.nix |  4 +-
 .../networking/cluster/terragrunt/deps.nix    | 49 +++++++++++--------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index adbe2ab5a54f..576daa88127a 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.13.0";
+  version = "0.13.23";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv";
+    sha256 = "1xx3kw38vr563x3bn0rrg1iq4r51rl0qci2magwwng62cgh3zaiy";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index ac6bae693952..c371c756a152 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b";
-      sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792";
+      rev = "d0cb8551ac28d362e77ea475e5b7b2ebaec06b6b";
+      sha256 = "1546kb49wb1qjx6pz7aj4iygmqsjps70npb5csm5q08wxk63vhls";
     };
   }
   {
@@ -23,8 +23,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-errors/errors";
-      rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
-      sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
+      rev = "3afebba5a48dbc89b574d890b6b34d9ee10b4785";
+      sha256 = "1vwgczqzd5i6bx12g9ln5cqfsbc7g0f8cz8yvcrasss2injpndi0";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
+      sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
     };
   }
   {
@@ -32,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0";
-      sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68";
+      rev = "994f50a6f071b07cfbea9eca9618c9674091ca51";
+      sha256 = "1v2whvi9rnrkz4ji3b3sinvv3ahr5s4iyzchz00wjw0q2kdvj1zj";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-version";
-      rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
-      sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
+      rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee";
+      sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m";
     };
   }
   {
@@ -50,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
-      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
     };
   }
   {
@@ -59,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-zglob";
-      rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
-      sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
+      rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6";
+      sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/go-testing-interface";
-      rev = "9a441910b16872f7b8283682619b3761a9aa2222";
-      sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v";
+      rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28";
+      sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx";
     };
   }
   {
@@ -86,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "d0303fe809921458f417bcf828397a65db30a7e4";
-      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+      rev = "06020f85339e21b2478f756a78e295255ffa4d6a";
+      sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9";
     };
   }
   {
@@ -95,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "05e8a0eda380579888eb53c394909df027f06991";
-      sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+      rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f";
+      sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml";
     };
   }
   {
@@ -113,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
-      sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
+      rev = "39908eb08fee7c10d842622a114a5c133fb0a3c6";
+      sha256 = "1s0whq54xmcljdg94g6sghpf6mkhf6fdxxb18zg0yzzj6fz9yj8j";
     };
   }
 ]

From b57fc1f1832e908e2f05f09f8d207b7069f9e677 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Thu, 21 Dec 2017 23:02:03 -0600
Subject: [PATCH 30/78] remove siren-json from dont-distribute-packages

I've fixed the build issues with siren-json and uploaded the new package
to hackage.  This should be successful going forward.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 83deaec8d513..b3b6a5a2adee 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8047,7 +8047,6 @@ dont-distribute-packages:
   singnal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  siren-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sitepipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From d402bd69a99e72bca1f1149ea7b132a84bbc1cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 22 Dec 2017 00:58:10 -0200
Subject: [PATCH 31/78] mkvtoolnix: 17.0.0 -> 19.0.0

---
 pkgs/applications/video/mkvtoolnix/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 183722beed81..867dacc213e2 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv
+{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
 , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
 , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
 , withGUI ? true
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "17.0.0";
+  version = "19.0.0";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88";
+    sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];

From ab623d8467c9f82666e8a6f7ee48eae9199acb5e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 22 Dec 2017 07:44:30 +0200
Subject: [PATCH 32/78] luksRoot: add the missing ECB dependency to fix XTS
 support, resolves #30940

---
 nixos/modules/system/boot/luksroot.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 1db5f75361cb..eefee5a479e7 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -227,6 +227,11 @@ in
       default =
         [ "aes" "aes_generic" "blowfish" "twofish"
           "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+
+          # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
+          # remove once 'modprobe --show-depends xts' shows ecb as a dependency
+          "ecb"
+
           (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
         ];
       description = ''

From 8869311ccb5e09c02bbcc0e594909b0cd9808270 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 22 Dec 2017 15:12:49 +0900
Subject: [PATCH 33/78] thunderbird-bin: 52.5.0 -> 52.5.2

---
 .../thunderbird-bin/release_sources.nix       | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 1df72dbe5fcf..656c4f03c0e8 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.5.0";
+  version = "52.5.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ar/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ar/thunderbird-52.5.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "e848c7a44222be7bc637dc2d0356028e67c4093f48e4eb9c66e0c02731f41b2e1f2d09cd7765ee984137fcef4d498aac8cfee39b31c0fe5187347107b2cd12a3";
+      sha512 = "637ca11b07a86b806ea274cf3cd9a47dc2d23a2700203c1ddfb25bac15bb4ed1eb4749f630021dd0f33f00c43539954d9fecc192d3582e752940ade0930422ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ast/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ast/thunderbird-52.5.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a9f8888ab021e696c8460d75ba1f843f8b31555f3f6f95e9af7f9c6d910ea1c3d68bab3d5adc6c0f70e6d8d9227db4176a7db762d28c1ff19addc95e0a756826";
+      sha512 = "78c6da93f60134c9b033f270d04b983713dd84ba6af8cd1c0529471dbd3c860085491bc54f0fd37a8373dd5164b064653d9ae6ab12f7748a9722aa61472ed7cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/be/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/be/thunderbird-52.5.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "4d903b23dcaf17d41c6b9f3d7a3ec936ecc01f19b93ecba88a5fe826f715b606064a6e2737611697c072e887f3776cf10ddba7e26a66dc4b91c3658129171580";
+      sha512 = "7081fddbc88cdd0280bb35c7f16c33f8935d639d91e2ed4258e344565ea6f27d1ed8f2b5daa5d2e861e92357ba65c4c4b05260fab83f0bfaf6e2fa44ab081fbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bg/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bg/thunderbird-52.5.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "6d34b3c3e907a16125f26f5f6365b5c3f2127ccf725753e94495b5dafedf3c506e71017d2b4699b755f8940ad0ea4241d6cfc00e958d4642c928c68a7e278fdb";
+      sha512 = "d5d21dfea54ac7c75c515cd95f0140a21451a3b2c533cc95f0a519a13b950e01c6f1d17e2fdae3610b46fef7450e1d816158a71ae37e8813d8b9dbbde2fbb4e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bn-BD/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bn-BD/thunderbird-52.5.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "74106efb92c5ba792a3f10dc0ea19d2fc38012f1f761c0e9b9753f8b067e2771a9c4691df55197a9b5e23024f73688bbc26d24357f0eef95b8b305bccad5d9f1";
+      sha512 = "c59b5b7381ce8fc65018bd70dce55488b12915d2c9fab7421433d7836cde95a409c2f5206323581bcf7af08b90e7ce8eb3c55b0a4f660734d3e159077ba60374";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/br/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/br/thunderbird-52.5.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2477afe645f7c0e0005a4817a42d24075dfabfce2724446bcd4fce50b72b7408895261544537be0e3dbdf8323e1af07215ca277c9e69261d575cdf4fc1f242ca";
+      sha512 = "f3d5bea008f0849dc8834d51b6ba0529c2f803e5b059582076baf016fd9a02288d57851e1073c1df3f79f4fdb0f72ca8c707d25f75109d6b33ed60353180e80c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ca/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ca/thunderbird-52.5.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "810c5295bcde18217b77e2f147a70a5e94798b92c40d659c47f3f113624f049b788ba9fdcdc22608cc57719e8236372636e6ca46ce7fde309b70fc05e3036f47";
+      sha512 = "64d024e4c696cffd4d97566411f7412ae16e98f169101bd36e87efb027555bc163f38ea1898b29a772fe31e1667dd69cc5eb19a96e04982b01b0de3975654292";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cs/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cs/thunderbird-52.5.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f8e033ed566d6b076213e33c489fcfcab520a0e1c3ce5c89c78c7443b360e55136e90b518428527a682854a24cb9b303a6c3475a59950d9546c1becd5db2a46a";
+      sha512 = "ecd78ba038a9133d8ecd0184ae44af661efd38d08e53184cb26b221d50101df38bc7833a0cd7c76d55a185288f055f5ac630b1da525a9008d878b4c5a3d9166c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cy/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cy/thunderbird-52.5.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "27ade0c53cee3fe125420eb7fdeb5b013771d34af735bacd59af6681836d81acddda3b3b9cefe3f8a05b70703c040d6692732c427db13e5dd971848c078ae7ab";
+      sha512 = "1aaef9550bb3e3e5a49ad220344a9b8e20db885e06eea182f87dc8ddeaac62b0cd2b94f58524b0c6d3afea054cea0d75cc96f80732e390cc47848da16cad3fba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/da/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/da/thunderbird-52.5.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "11de17a749643d35bcee49ebb1aa62caeb6806fd0025125363f228593979e873fbf8a927bc451c2e4a5332f431937c00601ff380d74e48bed60cfea5399b891b";
+      sha512 = "fa501b4febbeefc90ff9ecf4c2dc4468c6fd2dd04559ac886d8e58ea3d4eaf003cb4577197b5b5c391f602b83defe158b8e3405b36edf2a6e48e48719849deeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/de/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/de/thunderbird-52.5.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "3d2408f523d55471f0bcdcb3a05e66381d390f56987b448a40118b1f0e3fb66cba8ed64cb3178694873f5ee0c7f5a74303ffa288eddf7192a4f519d537ecb65d";
+      sha512 = "e4c87e3736dcfbe4e8fcce8a101030844cacfe2c20209de4a21cce247b8e80de3e4646c9a84c36d6d73199ea5926c2777a678b8f2b83521078c0c3a10a752b32";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/dsb/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/dsb/thunderbird-52.5.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d1f560111bd8d8eac360ed39b0ac741ca10c480ec528cad48e9bf6544d17e12fe2f41d4abe4caa3549b448fd1fb55416ed84fa864dd60fe0cabd91766e754992";
+      sha512 = "eb169f9d2e9836b83edfd8ef8f7af867ac27831bb5aadf5a75f6e652b507dd7c34ca135c278f95d8f967406732d296af3d42a18fa9e91c8ed18216da77824e11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/el/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/el/thunderbird-52.5.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "22c3270759d095c4672694c0885d3960d87cb9f53eedcf7c030f8a38f204d4809914b3fe1cd144f32555508eded73999907c64df2d9ae9494c69ce879180278f";
+      sha512 = "dfd0160965fbebdffc217ed171bbb308902e1b0e89d91abe8167d7d26db991a8ce2b40b3161d623441102b2b6379a774b6af4a19bb39c27c59d76840351900b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-GB/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-GB/thunderbird-52.5.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3e778e8f60101d2371ce7eb369c3f80c26fdc8164f5fcc78b8f65f2986288388e06d1413387b493ae479bd95b3af7fdd76f88365aa5803c4e9e3bb23e4f3aa59";
+      sha512 = "8c8506a8fe62e6ca55b1d99d8db9ec5fd224fa87ff63f9eae49656001f94124312110a414769d5d396574aa0e1f69a8f0a5298d6ad86146ba40912ebe68393a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-US/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-US/thunderbird-52.5.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d4eb0d90d621b28cc706bca0f6884361b7fd53cb02dd9ecccfc3f6027634353cc8f4c911824ebe6bf1d7bbfb06318258daad32fd47687f2f3b930c90da4b8830";
+      sha512 = "73e15c04a11190e8968bc64226ae4c677fa00ab460fe3497aab861c92c07ff6a3814673a7773ffc4e735491ac338e9d190e0c7cd626416c2508826000e1df002";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-AR/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-AR/thunderbird-52.5.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "0088b0380aa533e4c2818e0b384f5edafeaa3c84256e81eefd0dff95f27adc32c8a22b3368576d13aa1276674f519333b5c3f4a825fcc38da1abd0751c48f996";
+      sha512 = "6b42efb1bd21fb9c9df67496a09fdba958145d56b185d10187256e45b8891dcf725cecbf1868c7cdba515397085f616328c111301ab1cce584158a17ae47b944";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-ES/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-ES/thunderbird-52.5.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "251cf4cba82dbc10bc38039348894843b8f5c76875be72ce5ea1cb26cf26939055350e61a86e8ed9f63964bb95e99aac5442389c87588829e45e9ef41709ac7b";
+      sha512 = "c1eaa597f18102f93b7621d50b5ebb54f9007ad01b5ce543e3f53cae88a42ce06c7d2332fb0e6b080ac2209403dfe06ce24a17f09c7ae3d5ace8d5e85e1ce603";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/et/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/et/thunderbird-52.5.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "609bfd8fd7f8dc17b52173de9916133e0cd52e41e66a488ee2bd1aea5078cb9e08084c10d0b20be36204bfc3f785574500e2bbf9a81f307394b169068ef3ff07";
+      sha512 = "b0386ef97662e21806c15342b68b2224ed3b41a8f1648f1b9869b527eb8b60951f9453a5abbc74e94905799953af5a7289b25c80fc370772368f39a048ef89bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/eu/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/eu/thunderbird-52.5.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ebbc42c9d491f0f0e9ac5528d58c5d8604a913d77fb3d4548cb0127e356817c729c1ce87fd7874ae6f688268ab64b8b898611780b5c6b11707b455f529ab5f65";
+      sha512 = "d7070db2bac9aabbf5b020f60080d3beb9b1ecb4df73fb541f387435eb9ea80e2297c76a79910af0858ea42882298cfdd5c5016bd2049fdbe91dfe1f4bdb8b70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fi/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fi/thunderbird-52.5.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "807b4fe85c2b751e815dd4ac19b0e80199f391f7a8fe7e7f5c1f7f75e896620ddc7b758aae076bd44f9cd7774b2020640f858e139db57b508919d78caa77d913";
+      sha512 = "2dc49e7ebb96cafb37b600490bbf49a40393ed00cd4889e1bda6331e9dbf377a4cd53cb6cd98e7fb2e7cdf0da75e69e38e9f3894ab289f3ba0894f499e4f83b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fr/thunderbird-52.5.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d2d6e92815ed9176a2743578c32ac82150d4097eee6bf31356a9bc1cc1ba649c86008d301654e291bf0bf5ae2d81c13d941c4203aaa9dd3c4110d36a34f28140";
+      sha512 = "2ece29dfad71788ee5bf98afa262edc3b9bfaf57a2ea07d669c1003b09c5a5fbefcdb028d4842c53e17c1a63cce16f9296e574b834631cd485d0737cb13b174c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fy-NL/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fy-NL/thunderbird-52.5.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "bb5e34f15d63abecc4b68a74cf818def59caa2de47c9ab71458ca79839fd29f3fc2476b5e38a95d5d5252acb03595f0e065bcba5eaba6ff2eba29be66607f417";
+      sha512 = "a84eab825c051666d606fff131542c71bcad7f204db19dc10d54166b499869e43951c9799d05b194f66ff40d5f307957c2d27de17da6ecac48ac24621da7287a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ga-IE/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ga-IE/thunderbird-52.5.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "e6f84323e42ad5a0df546307ba0a87be57d1ead7b7a807ffed4cb977b5b4c19c91ce8058794da07fb1ce678e4f8e59838454deb9a19232a5cd7d60c6cbbce74c";
+      sha512 = "181fcdb0bae1a2aed16ba61523ec90f89b884d907796e1d1c37c722f68b89dbbabf977446022af6c7050e3e26d995e33891880e875f28247653225479847acfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gd/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gd/thunderbird-52.5.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1e28be9ff5c3ccefc320e020dbe574f9d5f8319eaa79e441ab7f1283557eca01501a2e0f4aca6af6e58157b4c1686422d70a258010657803ceb272b900ad3e3a";
+      sha512 = "cc91084f593788da76815f185e2b9a877409537cdf52566000953a008bcb2783c09cd8893cba9f387b731fd636b1d8e7b7208832623d1222b5fef72db8cb4541";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gl/thunderbird-52.5.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "db2d76733fb97558d05b3ccb963ad82ab6886d1db32923bb73e4a62bbd80353fb7d7cbe4e1a82fc9095d582e467fe9a045d82be0aeb319fddcdc88c530733381";
+      sha512 = "6491bf74093139c86a5809d02582b6d055ebdb3cbf29a1a24ff7529a6e8c2bb89e26c27e7f65bb588c379566741510d6f8372f7f2a11004350cc7e907a3a6d8d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/he/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/he/thunderbird-52.5.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "1b4640496d3a1acc7b8a146c8642f25dbc5dcccb7a164fb49a0ddad41e5a43d571936111154838b149bcee091205f0212926618ba5f233aaee051d5def345889";
+      sha512 = "4235dfe0f51f55dcb905453aadc01baec3b8033384e5085072abb600c71f777699df4b556233ffa9b07f5d62442aefbce6f1eef2a9d557b24b48d797cf03b026";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hr/thunderbird-52.5.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "5d4e361e7597b4dd0a896e38e31cf737dc1d51e87c09490a298147e4f0f395989567de2edff69f862fccc860dd0c18b24d2f91356736294c71429d22f47eab4d";
+      sha512 = "4236d464d704ba9c4c60323dd3518a37f71d24cd441404b6ae7a0e97ff17c839e2eff48d100211cf5ce9d3759336e7a0c29abe5f8390facedd769804adb8b956";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hsb/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hsb/thunderbird-52.5.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "40b51097b472a36078a7de4ed35446baf9a3a5806a92f13d49cb0024ca154e511195e6b470959b6084ba689c4475224acb81010f417618686a4e99efc624754d";
+      sha512 = "876a6c45e62c1025bf29ad3c626e3d2cbbc7d9d660e8e862b0fb586b73ed42a0bb58611dc69af727571c93f31dca450dd9156ba78b23b9a4a2116e561a8e3763";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hu/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hu/thunderbird-52.5.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "01a11e4e59c527e43d13c5c12dd95665bea7aad105d9ee9988e94671e394b7a55c2e85154e1bfb200d9290373de32d7c33ad1364e6cf2c189d8c9d8b52fb813a";
+      sha512 = "7bf7604f08e452f33154ba91cdef8aeda9905470f526f403dd76e19d1010f822cf2f3fb7c5f0525299bd0401139df1a12631f796d603e0ec3af4aa8df73ed0f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hy-AM/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hy-AM/thunderbird-52.5.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "bc3c78d1d3da660c66b64930d295f3e79467684d178c831ae4f2eceb9d9c7753e5f1b60453fca674346da5e6eaf3c835df7340f0cdeb0e9040be546aa69d0cfc";
+      sha512 = "bd62aedb2c800265fc34c884f1605caa0040794cc49479189dfa4a959d49397ef023efaac0937c9573ef7a114cee16504b5a65f8f8f3f3d4d222f4a173707bfa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/id/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/id/thunderbird-52.5.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "d377473cce2365f60aa5a65680daa2569716f3c331d20427f3d9002a72b42c0356e112f943db228a026f0d8cd5319168a9f718f3144b4c0a93ea3209c9003680";
+      sha512 = "1dd761bc1bdd865b5ebb494c00dede5e616a1bf7fbe6d7cf88d4f5362eb75435ae162d2e027fb7928783fe255179de00d28a29ab3d90350f75be7a1e4ad428a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/is/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/is/thunderbird-52.5.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "bf41f55ef16c9ec322d732174a1076e5ab6a5db12f861891bb0ad1becf2b630b7504155505789e9ff7778b6c708642da55630aa20c0c18ccf11734572f62bab4";
+      sha512 = "12dbca26babd51739fc6505fdd36ad32b5827e1c3e439f3ae4c2c8e0f165528e693af537bec8630146c6c6bbc55b75d7c5bdd3bd84b5255cbf756d627beac2ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/it/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/it/thunderbird-52.5.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "eef60e791ffabfae57c4e9f4094a39c8cb5c61ad4a8296aa111c6ff4e14f05bd86d4f9e682859ba6ae4e8d0c10001403d21bf8fa54e7c5688ca9e0ff06b4d2fb";
+      sha512 = "9c9b77c70429436b1cb0030c92109343eba9357f58873c13399e9e64f44807e06fc0c429e0748ce9a11f68baf643bec7cf313fe79cbfd35e548ad579b0e6e108";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ja/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ja/thunderbird-52.5.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "43dfc61aebfd6b80651900b1bd066e3c731e06854bb375d2eba206733d4bffb42f9b0116fbea0853f2aa440a6873cbe9e188ed528cff25c8634d7afb59e9d3c2";
+      sha512 = "2f785ddcb2e16ee1970cb582852ce52e1f3f7cbd58e8f714a18a387019b510cddfa1927f593b61ccc4b662b6e65f3fe20135eed451ba07a1df45b5979743b20d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/kab/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/kab/thunderbird-52.5.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "e75c653e6dcaa6a3116aba962afc6196c29e9194235b726e3ba0b4fe050129512f6d67358a2ce9e2b6879f6f52c6ada583af10b70cddde7ee0b8fa72edacc40d";
+      sha512 = "1bbd7b2c79cce7b74614e6f09cd7235d58def667f74bf3276ec928df4f0084704654224f100f227cdb350f839a13e474cbc98e4614ae45cf00969b2706291076";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ko/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ko/thunderbird-52.5.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "52e29e6b2996a59dc4ffeee6f7a35f7a491e1d44af370ab1537d0a45c8d9ab8b1bf972a24f1f2efbcb6fa1d8e9b7b15c7b0c00d5aaf24546fe7860c7a6f97afb";
+      sha512 = "e176558707cda5570b020aa0fc3620deae7edc6e7e363e1ba4b51d6cad9f4a9e74a35be5f419fcc0e18dca31b6c887a62112f99b4a60d9026b8dc5f87de45f74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/lt/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/lt/thunderbird-52.5.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "d935c882dd6a9a3ad5a6c5609047a6e3c2c4146b198e8c28657ad166d7b6ad826e6db0e4c88944214521f0cda0907281b50a6088432b574d1ee13e5c504c939a";
+      sha512 = "f431c57a74e0f8498a9a1ad36e6528d09dccf8b03aaf9e7ab66ddd503bbd78ddd15176a5e6c2358eeb616ee023f78414c30b67fd39c4c2f15f4e377df81759cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nb-NO/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nb-NO/thunderbird-52.5.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bd607e451f2601483aa4d59cf6225318a3bf1b2066d0f6b76c64025de0b20a8c8d8211f95b953440505248905d5b4dac569cdc610fe4d9d658a6ecc124966b82";
+      sha512 = "5bfae55863550e32ea6581d0c24ae5374e2365d9e5e8f05f91856d0fd2760b761d183b12c9809668730efbba63e6c23408431f4616f6a7cc52ee465ccb939aba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nl/thunderbird-52.5.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "4767403a33047512f301617dfdc779f92e001114a06f31244e5b9a648ed4a7a96c6fa16194a803682417d151f2f9d61da241065f15cdd2e5953eb5ef41220093";
+      sha512 = "fd7d35c0205610d868fb0676f3a8aaf328b1906dd1b174124e254ec8b08e5173741853938707dc99b10b4417df4a7010e20cb8a1038bf8f3258dee593cf788bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nn-NO/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nn-NO/thunderbird-52.5.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "f2fd66bc8a520f90fb65e5f737ea25e44f5e3270429cfcf878e4b128f1facfc3bd29282586aa6ba73478de04cb796322436d14580d86fb5861072b6722e2ef87";
+      sha512 = "1070fbd6c51d68e560fa0eeab66f2baa39d11752018d20d23a3577b12b504355f5729d0d961ffd20256521f54eda69d03fb8efef70f8254685e28b0164201354";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pa-IN/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pa-IN/thunderbird-52.5.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8e4c38febf02e61b874f931b0cf03221781ed9543f9b7a392ca9122f101622c20135f0fd94e5ee7696d0741a9910e1d1031fad3c825941d54da1f56a2533b61f";
+      sha512 = "12293c8258f02403c8db220c73cf76b24315268324f2c6ac41dba7d77d9653cd1a21771a4994f7c6dc0db9948a601008e347d908c05dc59b7cf6ddcf95b2e86b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pl/thunderbird-52.5.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "3e6fda867feb132f37913a8b2bda2ff2736f4d804e274f01c306d387b3c48fe30aa04b6f85eb4a7fb444036bdd4b3fcd4f68cbb53244d85b5064aa36c3588cde";
+      sha512 = "331b81876aeb162e1f4e838cb00712e971310285febfa669bf7c6d245c1e8353be941b6d1236423e0d835feacaabf859077da1918cf2652f6b79de30c4beaa30";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-BR/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-BR/thunderbird-52.5.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "662e0616d12fcb7dcfcb98a4e07228509ae7ad731c93d2c90a7bb7ebc3bd0f9636563a70977db14733c832220258eede361526b01132dd02a4e44b16acc6a5e6";
+      sha512 = "d69fdae2048b738133fd07c6aa0ab6c264e555a3bc3a899d09fd7fe49435511fd544f3ef04e079c4efd320bc2abfa813f85a5f2a9e477af56aa47495466103b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-PT/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-PT/thunderbird-52.5.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "8037be03b26263f3a1e69c4971cb70db50f95356c97e3252f76f080f5a7961c1b2ac5aea09d2e142994c5fc91c91ab8db738e5a104795e8506a06c997977930a";
+      sha512 = "fa3286336d47b2216b0ec0c5fb6cba2421cb0cc81d1f815515c637a063b8de167cccfc3dd30b02636ae88e74efb34f8fde1b198924fe864b1fdc08d95b7f0f3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/rm/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/rm/thunderbird-52.5.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "93a76b870c15b61a1135e405f76897a86674e1fad2dfa9b3a71cab83f99c9369b7363a395e813536492a25133548f227f5254795cd20de78f127c969fa3ff5aa";
+      sha512 = "b4affea897ac5af177c1fb6e4919f94f5f20860c3f492584c79664d803b7c2d092a96f1a3afe6b3212f689901a52d0ca74abab4910ba291280d52ecef2cf9a33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ro/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ro/thunderbird-52.5.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4a535aac1f6666d20c7aee65ee974bd545cd4aba56fd0ea2655d89a532b60bcbb174b8046792365041b431d3d3099e0c273c5ce83f1e1f3599a476028b482f37";
+      sha512 = "3cdcf374f33961484962a6294ad8fd654b006f3472ce6550936a8c00a28943088c9c61049fba278cd304381003b46903a5514ac340b5a85a959edfe17242eb4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ru/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ru/thunderbird-52.5.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ec56cb45428ce24497ad398716f99f49d6a5787a042855dd5839e5185d43763ea87b89090bf15c571841aa0526f5b4b0fec8958bd673a39ccf33ad5f2937b33a";
+      sha512 = "aa1d54fe356ef15d852a9ce3f269deee411d4815f4108c93c832def784c1afa104193e62fd9b47977d20ecfcf3057c05d76f39cc3abeb0341102b7e6e6639763";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/si/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/si/thunderbird-52.5.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e1b19b27571cc833de579d1460d27629042529480546cf3de11a39608b8d599ffd19451ae3df96390009e95b87521f17e5843bc77251c923823d3b0529167f17";
+      sha512 = "543710116d67afb86e316dd17bf9a74a07ee5e3772381d9f0495af4d42075e96b6ff888ce0c3ce68ec779dc051f3ecb6105d51a6e4459cb4907a604662c933b7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sk/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sk/thunderbird-52.5.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "d20d0649426fbcc812b536d368ec5785b32def01b91d67776d5776a7fb45d9c723e1c455d20eedc7825370b03e484634ea42fb55dab5b3c860167cbeb8596c7b";
+      sha512 = "3ae5ab97172ff0f4d3eaea7a69fa54d9bcf639a8032ee2c5a3fcda2d8b30072d3386c54ef7e8c9bf5417a6030966c1097d69d41dd8c5355e82d048b783aef461";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sl/thunderbird-52.5.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c37ecb24cc9bfe2d31459590d0882fd9cf196e822a18105b61150db4049bd52c31bad2a05ebfb710bf1d1d879a22b3e6fdca08ec81663e1c1735a4a2d157b4b2";
+      sha512 = "9f3e0724e837608cf4a64a2505af732e4cdf61928bd5dd1237e27d5222147a8ec52870e88c73653de8518e9ab81af4fb8916b067c780b1af25b8f6c208a10684";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sq/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sq/thunderbird-52.5.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0ed120ba3b39f884784269a6098242b8e1298bb4287749b901c2702d06c6824f762942bfe05a0dc1966c19e883239b09312139ee7eeb2cb22995d47aa2d124cc";
+      sha512 = "0f2e10a8b9cae1185079af8e37ca9622d9ed29b6bb38377cc2db7523dded8da4969798941ab1e99cc70b36bf2fa59549567cf5c1e1cc40ee0131350d60f8239f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sr/thunderbird-52.5.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "5e83710d06507a40705ae5177e4749c31aed4e932efc0c51f8da6a4b30d598328601f8a53b9fc0dc35cadcc130bb637771454d9cf55e8dec2b934287213e17f8";
+      sha512 = "1f32b2705e4939c5e57f7a6a3eac29ccacbd90bb93361007b208a0eb1aea4f279b50fa17ffb86571cc2aa793742d3ff62caf28047b69c95ce358b6ec2cd24268";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sv-SE/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sv-SE/thunderbird-52.5.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "4cbb20b1d818f0238cb0d5235ea82a1984b8dd632467ca91e3f3f4e8ba58de904603d1135c8a7ea359188f1b01a6ffe8d654a2d0a73b4af1f3862011d697f755";
+      sha512 = "887176e1d4d9cb385ce0261a45f22bb67a87a125da737403c6965a6dd57ec7f0763b1245ea0d04b79aff5f41cd1ded3a06dc4ee301a17c01a9417ea2d515dcb0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ta-LK/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ta-LK/thunderbird-52.5.2.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "3c2397e9b9e8abbbef10af15cd35ba086336daa5c317ba60d4489786b3ae4fee89457f2b34c0b42ea550000e8536ca3fee94032848b11dbb2c4cb6fe489efe6c";
+      sha512 = "fb981e6175b1f8fe79b65f2c324e376a89c7378074a6ead4cf3444516fd8d566591f942133642830caeef1f342ceb169d2e558171a5675ffc96a82deeca585a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/tr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/tr/thunderbird-52.5.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "9360797bca24f5477120d93665f9b4aa1614463558b6646e2813b31fac5b5bf84d5e88a752696c28fb51613c288482e3d88197ded2310b66515582b11f81aeb0";
+      sha512 = "2ce313b74b8512eea958c2c3e303829a3d7452a48efc07afbfbe9ea783c6099e75693b679cddb65802fef5a47f98526b7ceaf4c1e7fdebf9357c91d5a306bd70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/uk/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/uk/thunderbird-52.5.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "ee521d20fd5e7cc3f803f74ef5a9ecc4c1df8b149668489b28cc212ad2d5c765bda838904ad726b92b5e0e2eb35c2ba6fd4f48ac7c700e41e896e0e976fe2028";
+      sha512 = "dcf852d0c584c3959fe0f7ff72cdd45fa8497aa1ca44ca036e849c3395da470a52376343f4b6e37a343e2f2919245a52e63bb5dfb5651bbf749c72c35a8918b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/vi/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/vi/thunderbird-52.5.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3d7b7cd1f83e80290f460829b49b6893a73871456cd10ab22da482381ece0ac14fac3e5c0e2fdf1e61d463b7c211c33ec8d98120fc0bc17d2052bbbcd4e16af8";
+      sha512 = "2b3c262c1955045bbda194715f4e9fce97872054ca8cc6f7bca3c1c6da303ccda4715336c846d47bc204fadca003ba9f4efdb6798e55c9e928ca822544bfe152";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-CN/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-CN/thunderbird-52.5.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c0f9902bacbb659f5f012f30b6190d4e3e53baa7e4473cf231da0b7c509beb98e49f0e4fd1ca3ed9917c54279609ce5fba1c51b80b12aeafedb82a83218856d2";
+      sha512 = "74e7d7f4039d38f6af9590303d173d7293046f897e5b23acf8ff16c7b1ecfc50d0e8896550ee371f19e73518432d137779cba26bad913e8deb9e4af1b0637edc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-TW/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-TW/thunderbird-52.5.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "64dbbbe05b3ade46901686fa4733cc7c25570d1f02b378a2b2855b75905e687db9f97db852bb53e2baaa1010a0ff365bbd90060eb7cec7db745faf014c5e5564";
+      sha512 = "914af708ab185b76a67e8a2a4c85c14f41bdc05bfbef66c56a8b28820e4eeb866dcb6d60b1b4b61d924af9a6ccfa9ec6a10afd6ffb74794487472d508807b417";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ar/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ar/thunderbird-52.5.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "1e6449d23bb937d07fd28049ef4e36b64c1f36edf3f4def640dfa6412d354ec6acd5b1642e0b266f18334f3ab7806a9cbb016946c0a36ec4222cfcae39339bcf";
+      sha512 = "b749fdc34c15b48bcc0b99af41ac0357fff3a9c4bf774de536caf1fa65b33dfc69a4a14a4cb0c06a82d41e222362cccafb9ff8f4ca64c128cf0a031c1161d74f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ast/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ast/thunderbird-52.5.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "38f0fddb28d8a894798e9811599e706e60ff80131b22568e3dc70ff7f43388acd6de5ee4485587c59fdba8f790b393f4f16cef6bcdd86b928f3fa1bfff7297e8";
+      sha512 = "f3ddb2b95237e8c505286328369c9f7613e5cb22ede50f8842e936c158aa6cbdb053de6c0f4ef0a9256b394b5510c1733ce0f8cc8423370581ec54b871f59b56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/be/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/be/thunderbird-52.5.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "0966c3fdbf73a51d2c7776918abba4b77392dfe2308aee36970cffcbbc3e1de537625c0b5881a85eea74817b33055278d976af719773579885b3294746a3ae50";
+      sha512 = "d41e1bcb8460015876d784eccb37aabfeaa8a283f408e6606d84175f3e6b1e7428b8d277d30b250192cede4cb6bf2746945cf6fd4afa698fcb1b4230ee0f6d5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bg/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bg/thunderbird-52.5.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a0a792063a3eaad2d15f4b726c9ed170f59f99b1ba9c966fdcd6471865dcf2f25284ab5e4e28641a66fa8ddcb019f8b8f521d69f5ed5e8d1ebc2729abd9be8b0";
+      sha512 = "e07885f88953dab1a940d21142fc04c7b8b2f807fc424f69b99f90d4a8f5ed034fc00de92d76dd4fb858c669cf6c3e9cb82f93ac3a264ba71f7b644e99849fef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bn-BD/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bn-BD/thunderbird-52.5.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "ea583cbba8a0080a5529fb91988a0ee1c7aada1447b616e1ae43b6eff86dde87768cb4fe90fdede8454ad5240d266bc5e6ba9f1e5e05f2ad82cd3ef68ba374d3";
+      sha512 = "2cdab1cc1066ab51d8fd0787115568cf70f3d584d2fd5e3908eee0f64037ce61a80a3f19ae31dc8cabca8f05cee51221917c717ea535a5a8085dd3410fa56422";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/br/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/br/thunderbird-52.5.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "18060c8473e82554ff793ba495ba6760c7d7d8c2ccf8fdafbb41589c57474baa0a88808d154a29f6359c657bec40d9d164e53066d44bead78d4661b229522783";
+      sha512 = "0db76f3544b14360bdee64186b9f828dce717d72d23ab59d4568cf079dd1db138e5b79eb500bae6d0043550bb906a0558f07e3b5ac98d0ff67705578d04ebefb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ca/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ca/thunderbird-52.5.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f63dc5e923d8e60470fa4e4bc5adb8ef629a82dcca84a87a6e742e9d34a8709cd0946a85bf5822b19b5ff5c1c34b6e290439f3e3418e4ab86844a0ff54c2632a";
+      sha512 = "6229309d3e81f374f4f04071843e3a1e7e18ad8316359ba6badd0509284ef59c16085af9a52956a5a2f438bd9cf8c88400e15fb99bcb75001f08fb72c285b3ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cs/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cs/thunderbird-52.5.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "72e1a77e10105a757c51542bb236d10c417f96f58c3875b63112c71848ce023c8754971bcd34dc5d2a48719070939d3733df9dbe4d2218e7bae7e89049d067cd";
+      sha512 = "12a2df8d37d02076acf6cd2bc86bbc71e38e157e121b1729096c880481a82d23a0c1c8f1c8b1ff53193aefa1eebc64ffa49bebf38dcdee5fdbdf429bff5d9993";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cy/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cy/thunderbird-52.5.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4901eb53235ac29cdf685dbee78db301abc1f088ea9df585e388814c8f48d81aa0daf816f927b0c7d6df7985d8dd1e64c0c1cc26026f3ad9625251a72b666692";
+      sha512 = "7c71ae8ce62dd271e0202b4e25b52ab9291ff83b920465b9a96c36d55c520ee87a5a348ab9d0ffd495744b787d424741ecf9e89ae4879281d0a6f2cb3742ae2b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/da/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/da/thunderbird-52.5.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0f061a7ad1e3b113d7b954487d661b4ca57a0ae861770c44081257a069e324388ba506b27ef0123a240cd949edb4ae60f500712c0addeed146cb922c76bbdc32";
+      sha512 = "36861c719370036033286139f5e93d750eb8712afea42df7cc7f8bbfb9a00dde999e3ac4e38bc48b64a343a8091483163914cd362e9e30e0f9a98c6cf6a1783a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/de/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/de/thunderbird-52.5.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "12ecdd09f77035ece4161c97cf4ae8bffab6a7eb46c7b9a2f7323dbcbdcf4f3d1bfcf5fab4d40b2887fbf64b541c0d5bac54f1b8f73ce7e31bfa201e955077c0";
+      sha512 = "8571075c5435ab4763ac1c0f3904ca39b5ad1363390fd78eec9b73115caccb3eb3cc9f2e1a8c4119469ed5cc99d648fc905a8fb4d51c0bd10dc9ecb0338ad59b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/dsb/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/dsb/thunderbird-52.5.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "54fe7ff647565d5b82843d879ce3f791b2962bb034ec2ec2d5ea85cea3019ddae49f9f45384751d1a2d0f879aff4203a61687a4432ebdb948fd30569b6ddd7be";
+      sha512 = "1b873aa804d253786b37a8bd1e85884f12c48292c3703d9c04a9d370e8fff73b0d865495a65de7fe690e34f835220ea88810194385ef50f3b285e8237f3761bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/el/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/el/thunderbird-52.5.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d667a2d4f3782c30b308cfa6dd13ad321f6b7108d95f05c68dabe085228de28439f8e851920205404e48849829e65a07601ddcc553f3c73b08e233175805f046";
+      sha512 = "8f6327796a1e937e0d43f2af23f25292ee3a56b9d173bcbad1bf1d7cd60ca464570ef4a9d8255d2f3897dc862680073146a6509944014d0abeb21395da8c0201";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-GB/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-GB/thunderbird-52.5.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "ed7d40db832e9abf89d0d1e497f1b276dec7836e494b616eee8db1557cddd33f6f700bc9f17db0324f7a3b191ea425a7701b7e2b10630c21ab07f3c709039312";
+      sha512 = "e27a9c743a1d439e3cda7f2924c01044c797f88bd4b90723face80a472c8e0854c747472e5cb72dfe10ab1018188044681e1ae633ea55f4a11aae6f62a3a891b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-US/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-US/thunderbird-52.5.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "9ffe74492c2fe29523a34b02ab869f9660aa1c33b16e45a026c4404e714b9cb6a5d2b24e73c7ac2f52e22f21e6e88e9a7686edbeb2c0876594054b17222d9ad5";
+      sha512 = "b20aeac366bbfe257e709133fafa59bc8fd784d33926a167adf24d2c90d2cf5adfb68815e2000de4837be7cf73258d890cef555be82112aaeaef2bcc244f634f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-AR/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-AR/thunderbird-52.5.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9f154f4fcb465925d445cbaecad4495d12d6381f0afd502973c4869890dfcd77366fa90bba835016729343947e064772163529528bfa76d52fc87bba5e9af1d0";
+      sha512 = "a3547d8ea9675970dfe9dc40e1b763558fbb204b8d0940156b97212f2a5af00ca82ea2493f77fe896e257d7e0cb1ce7a1fe05a4c23aaa09222da43cc9b823e88";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-ES/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-ES/thunderbird-52.5.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "4dc72ba78d8de913ab2b3a76920e0f4e3bb75cd880c3a8a55af72cc38334906e5786b24feb0db7d1e12db845f995c28e3342b5bb1bd4600c70de6b9fba012194";
+      sha512 = "2ad8177608038799c2ea653ea056c599949972a51493a27a34d4aa0769814106cebc8eac3521c7d6186432fadbf8e17e7b9e5221bdd1bf70de4fa80de163e964";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/et/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/et/thunderbird-52.5.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "64279f558880cd6f6653e9387b479f08dcff440a23dc9a7bda664f09ca641cea05a268bea7cb7ee6495910fc67f1294f78bb163d09d70df06f335486d46d7ee9";
+      sha512 = "a68d4606e943a4b5841853b1c2d5165f5c97405690d467c0548ef0169fe472e76088c0387f9adabcd5837a3fba72287398453c4e149343bc9130348b5d62c682";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/eu/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/eu/thunderbird-52.5.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "90185fb2a72b648af46b83470b2c57ab8784baad2c75c32920a5e6e1d5e03b5fd3a5ffad04cd52ea73a942c4ccc9b02d71ef7ca4887d3d089ba8f13745087b79";
+      sha512 = "dfc826d722b7ff331df35b6fc9b82eae9714f8f8e75c1fe3119a3b449a5b2817a8641e939ddf32b4b6605406a7cfeb57de24493b5a4d0cf9992a3dc30f2558cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fi/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fi/thunderbird-52.5.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3d8fbda9afd0bb82db6baba04d06682c5083a8a05cb941552c5ae2abfa0fd7e9ea9e020423877f3141922485a69c1af5d48235dda29fb4b583c1f4435a747f59";
+      sha512 = "2676d22c662a5d7b4b3eb32a71b032e76bb609b39a89381054b254ad7a966625af2166b2a5edd9c09ad8d9728933203c99a3c60e03c2fb031b748e94c16eba77";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fr/thunderbird-52.5.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "669723deede608bb8239ee5a04dcccfccf3680e32da494d28fe5380714b012a322caca38eb3b6ccb3c136a3a9742f917a5614f1183ee08b80d760fa5cb19493a";
+      sha512 = "b6ec3f6f2abb0f1ae8de3167e03d9d254959a93881b4cb8202db5880bade5569a53f1b5aaeaec10fb6fcfe453fcbe7cf0c090947c546ec62ae0f858dc0b251d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fy-NL/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fy-NL/thunderbird-52.5.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c35371dc26545e5f1b30a1c866538380e8d6cd21456e1415260cfdcde3c37f6f301f1a5ebfcba4d6a5612ed3809f7a27e5a5470fd5f5b7146b923ab15a5046a7";
+      sha512 = "c0e2618f223f5b58d80283b23c38ce703d5fa019444dc2168d1ca88149780e458ed9c5414931457a0a3e7733407eb07b1fd38f3b40c381db2f012c5a1eec7eaf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ga-IE/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ga-IE/thunderbird-52.5.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "1f5eaa4928e7b56ad27937b6a49f90fc5739149dfa8119563eb6153cd1d850243ce3a15e42d6e5a7a7c306401c97424b5ebbb6bbc7d20102aab09723c91925a5";
+      sha512 = "fb6e815a5690382f1608d20cecb596012677616cfe3de11ba8aacdf32c59314a5e61ade11151965fa4c5f310445700f9fe89e14734f8876ebad4dcde9f46535a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gd/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gd/thunderbird-52.5.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "61c1f4d9769981149a5961c096d9826e737ed356582b90d09efc437c38f93d9897ee84489f33e3fdc20787dd9d437ed58a5592bc5f586748d3e5897ddda38b20";
+      sha512 = "3edf7e424f7a21540225d6e30543bb39f395564a3effd5064f3471f7922c19e275fc7b20e1df929a93eb375e0b37937f5beb239003300bff0af8af0d2f7b203d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gl/thunderbird-52.5.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cd23d74ddd303be4d86e4c63d5d2186ce3d0237caa62b0a48987b63c63322898f591e4b2c7a5fa5d219c49cb28070fde5cd933050dc0c0e6b9aefdd5f03e5b1d";
+      sha512 = "7afea0817603271e8ddfa01374102f8856fa1d090fb3a98ff9e3ef477aeb019f3860e68c6ea72659ea0b65c54967c68bfa0d84a040d7677469ece8460fbf93c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/he/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/he/thunderbird-52.5.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "58d98ff08576c3cd3d5a8637b8ba8dbab1b7e61942f4dd772ca48e3fb447a2dbcefe2cb9ed8cd3e86ffd0d9f8ba33366dbe01d744a825bf513861ea870d69ecc";
+      sha512 = "546484c47f925bfb92bab962735cef6a74336d6b282881afce1054caaee559360e2df1d497d857a12ae76b99ce765ac985adf48d17f9a759b262f8b134e9adf0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hr/thunderbird-52.5.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "770a4a095993a9a84266b15e461645c4446ba6370092f1d0984d2ebcf836d24538276f63f9513dcaa537a4f016bb699169dafb14a68450f1e13050679800c5b3";
+      sha512 = "552ebbc20522633fdd27117a941a0541bc3195b4a650612e6bf9f5e341f09c39efe1a58dcb9b0bf3ebb4797c7cf49e7d8a8d7922d2f3cb83284f9a3dca7e6b68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hsb/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hsb/thunderbird-52.5.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "35f0a061f152d871636723b4690d3a3ff7172abb5adf0644b02e44fd23583e9a9d8ea68890a5313d74d190a6d293798b5ae8969a38b1166cd942a3d17b0246f6";
+      sha512 = "f92450010bfb1d1620bd4819103d89f0d58af567231219ff106dbd48550e04af2900b362b93bd199482aaeb72a0ac88344e3767d754d6934d401cca13af4b718";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hu/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hu/thunderbird-52.5.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a4e9dd6ad2295cde7d7e5bfa8efee3c68123ae11d7535f0c076e29b18b952320ef39e4c92e8ad4aa66f63d8490b5737ee849e425378db04df8c794bb64f5393e";
+      sha512 = "6a4d10925475f3fc499f49894f6c79de88bd394c9b3359efb326e55aa3e1af9b7d6ee2c853908bedd95e113d697ae3b25e612dff72d81d01addb1fbc39c6ea36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hy-AM/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hy-AM/thunderbird-52.5.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8006eedb925424458cc9e084b367d4b8f16f78a6245159c61f13b75455404adf13eba353b4141cc555d82d4d6060deae9f97633884ba6d3b18d88af8bf93c4c7";
+      sha512 = "ecf982393bfc9c826dd74ea6c0452788c34958f031636c4f70bf12388e966a3630cde159f3751540b3b917e52f0b64a2cd572d211ef3b61d97725a80f51b4f5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/id/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/id/thunderbird-52.5.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "df166f9e33adadd2e38290d1ea92a035c9cd0d910c1b246906ed38181c8db12bba29e69b4a909594a79b8b3eccc23131f34236afb40d6746793cdbda3a195bcd";
+      sha512 = "a4d735acd212827ceea6205125e8d38f292b0994a5375738857b12531aaa947539033fe3be3e198eae82b77647d243227200a9fafb4ff2729bf4b0028868295f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/is/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/is/thunderbird-52.5.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1a05df69389d95d9920e133e085a0d3a05eb917b1b28c24fe9d8cdce316e19319fe08aa7a3fec304153fa0f59a0b8a630f9c44fa1d9c0310de03fc102172dbc4";
+      sha512 = "8d4b0a3eef192d42ecc9c65eb692b5c35ead5c1a7ef17f575e96e06f8990a76607b31abafbb03cabbdd4385eefcb09bb0477c7a6cff1b5fc3a60bc9fb1d0518e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/it/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/it/thunderbird-52.5.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c446fa3e15e9eb72aff880f928f5c8a0b2b0c96632c243db4f5c377bd2dab56ccfb569a8500e9778ac5a4459ca634dc6d2ec1ec0f05aaa2980d3f45109fa2ffa";
+      sha512 = "4f2d5c1bd7cc404bb8ab6097bc3dd40424a745f8a6cbc0e73722a28d68a582150acbdab83e02b89811c6617e63a2d56f5f02f6fc463092e8e959a91552a6f3d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ja/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ja/thunderbird-52.5.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c7699f90c49fc4bca1580c749ccc446a95cb9f1a5a48cfee3b2a566ba13e073a4e405ba7b17ebff704f719639e323332f533db19f7c82007300322330f2b3983";
+      sha512 = "78445e5bb7211d7319609edb30e063c3584ed8c92eb4fb2953520720125306c28905e2248eb5825d6bc09399d38e35f37be57707e64edd3aae555b4ea748205f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/kab/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/kab/thunderbird-52.5.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5c098954ce0e642c76c3597d419bcd5f286d62af96ccf2726bd00cefe12036708217cc6829c39cd669a21ed0cdfd8a6d511b8a55e8dafefa8c3940040e99d9a6";
+      sha512 = "7ad9d0213a2cd6297cf899f311ea3b8a7493f8596c352c351aa5aae3c7b0639c787dfda9d63adde7b2d920277c09d987b690506c762e24da16d86f985cb8f846";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ko/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ko/thunderbird-52.5.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "0a435742a13454634ef563b704d1618ce492a997814466ece1066e244160494e2092588b5cbbe5d1a7076b89c895b5f1a3288a377b547d454eb411960e3faeb4";
+      sha512 = "a76a8acadbf082a7fbaecae8798fbb3fec4d03515db2f0a7d2d10d15ef468c128329e79f68e9b0075c4a7767bf56de5d3f1f5521cfa7beaad2fa2026fecb43f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/lt/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/lt/thunderbird-52.5.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0ffbe8a40179cdce48423c70ce871ebbce066932cf9ab21560ba3107d2794198a7c8f5d5d3fefa58627beac4faa2ed398a09c429a47b261153f3045fe5779883";
+      sha512 = "cd8911a16d2662f5b80b76b04013113a8e9a231d25404afebe29852b5335d587a1dd22aaa74727c1b74ae5b26ffbd0f4723fc86ecef5c43397485a5199d65b71";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nb-NO/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nb-NO/thunderbird-52.5.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d44ece21a5ce26df33d7ea04f56cf2a21dc67bb053212a71a2a30dbabb7894bc9cd5b8a07f86906c882fda29603d2c8ff16d675c8e8bef8ec362be8c824624a9";
+      sha512 = "3a82189796c1bbbe4633ef7beb054cd5f324504173678aae2763714b4ca25b04bce479eb63d89abe920c89ce7a4159eefa5e27b6e5959d2bea01a4cd53e13e58";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nl/thunderbird-52.5.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8c2489dd4d860fc657893986f268746512cef54943b19f7c129013e5a6a8db8f4a8fb0ef22b1cfdc41306bbd63d1c81131989af7161d310cabe2427e21ab4702";
+      sha512 = "63e40217f5abea50375c0fc0060cab6c6291acb25d468edde8a14751c0693f0e9d751cbdee339a2c141269edad6c4ac87ec37f440257b5a78492bc43e66a9cd6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nn-NO/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nn-NO/thunderbird-52.5.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "57270f4645bc1d82f3602a49aad11bb6261a2be39200b3284ee65082df363b5870b1cacbaeb3802a83f6ef1554a4d6a2c6e6b2720aa2b9d29b7a86208d676f6a";
+      sha512 = "bfa15dfb0606ca225ec370426b983a17c614dc850b665e40ba648504f5d9bf556a2f31ec20533fe739ff94f57f3eb5486f422972c7ed8c08d8cd7c8a023f9937";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pa-IN/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pa-IN/thunderbird-52.5.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7a7464cbf08e418c56c979abba5ef7120f1202073ab630ef4ce070aa1b55520597dda0b0f31e7afc50e14c8c4fe0f33759a2278035d5db5f21edacb6d521672c";
+      sha512 = "6989775d3e36ec43aeccf3db32627d3f1be13021943a088385313fc7111d4288b8daa32ec37a9679353d68a9f15761fac2f7a4eb7dc1a60e3d15598296b11f82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pl/thunderbird-52.5.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ae0b8da805a3b055bbb64a3c0f1d3562f44fae08751026b8300c130f4a2629a1a17857d2be2468c9e2ddb2a082155d35a26b7b1f0c99369b2031a90b34aa2443";
+      sha512 = "05d252299552f987641be34e5f3462d56b08b01a66637b2d039d1a39f2fdb1b9b986ecd353bc69290bd64b5858b2e7fb7c928209cdbb98b27fca479ec8f959b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-BR/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-BR/thunderbird-52.5.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "f61d66c71c2144aba0781f82370318fcff0637d4bb28cda3703f099718691f13bbbc51eaa4252ef1fbd1dbe821032597e41adb80b1abec89a2bc50df043f5099";
+      sha512 = "b40deb4d5239e335f2c2e65d676cb6528c3320ee28bc9d83dd53bae2a486bcce2921726309754cc0bc155d3f8a0f56d69aa98e782bb4b8375cfcebfee5f58320";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-PT/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-PT/thunderbird-52.5.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ad0d63ab9389e3c4cf6985835dc4277d3ac5cf79e09457331f87629c8f9a58e95ce7b68c2eec8973ab445cc8f8c50c0b01b78ebd0ada042f4fa6a2d2bc838241";
+      sha512 = "0afa965096f5a79b79b3e49af1758dc200ceb8161192a97d260313f9582f1c8b7a1d4e54e093cca6b9c92a9458dd38ba0493fdd1d6567f0505a90fc9bd97f09a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/rm/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/rm/thunderbird-52.5.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "5e5f96598101695ad0d16a7f3aea38c42d875b3d7b7e2eb529786f16cc008ca8b20bfcb24d2b975cdd2e114d00c1d17f8901f19fa84263f64506d9d75568e6be";
+      sha512 = "c9babc6d6e85936a251d4f7214991a06a3b92c6ae207a8012fe14cffb277a6b2468213a4ba94672a360bfdf9f4b817b8663cc15ceeafb79a63cbac13310e1aca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ro/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ro/thunderbird-52.5.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "82a0324bc4724460d5aafa194a78d611c1d11cc347446d5c2203e9fb40a45f6c7ffb0e17aa87b603af8b3ae5847fa91cac529ae878a6981c9c754ea91b8b6b52";
+      sha512 = "86f303e7878cb988ee1773e6de2ea6b433028d4bfd40d9388384b14b5343b1de9b6b5084f92f1c95b4110ecc7fda669ed98d50dbb6266a775f4e058d5083e24a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ru/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ru/thunderbird-52.5.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "508d949263abd425ff805f417cfa60736d391e1dc99b53dca2243c4c93487ad2889ac6a9bd8beed59b4e09bc82ba31b9c5cbc9fe084ee3b5fde74baaa2720a7e";
+      sha512 = "d262ad2a73ab34bdecf6d180840922bfe16fdd4dc7097ccd900712d99ca915da648f2a196accbf6ff9946d9fc48c674e9eb0f0bafdfc94cd6f9069139cf0f036";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/si/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/si/thunderbird-52.5.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e9869c86acbba32bab6b536f2542b498e9de0a306558b3115ffaf143f83c5a5010ead37573ed7ce9565c42b6306d98b4f92da866ba62f5c4042dd537f66e377e";
+      sha512 = "6b39cd9501b2dc44d033efe9524c5865cad8fdfd8224a51fb04679227e5306d67d05a9acaf4f5810cd67e6d10b1afc69ff80e63a7926616c35c79ecc3f02d93b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sk/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sk/thunderbird-52.5.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1297d9a8ed5d062790766ee5cb66a1c3b67526326440b5d3f27b712440c0e3525ab2231774e02436bfad4b8ccf1006e5a16d2fce4be26bf2c757427228f7fed7";
+      sha512 = "356c86279387b023540fba86f73376b1be12413887f8ea2c3b706ccc268aad282d77b7eb863e58d6f15f66516dd4bd8f56a8f413815753dfd6496f81ee842aea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sl/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sl/thunderbird-52.5.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "734d57ba493e160547953debc20b1d5565c31b0e6e5b486344f5da65aa4cbc77fa7790f49f4ad6322a633232fbcca2f21bdeae7f4abb2aa8cf13e5741519d706";
+      sha512 = "86d035a6b7108fab33582eb665afce9063e3d55b0c468b81569503cdde7ffe169de227024e94a60dd45e39073eaa3c3f313bf061c0ba492b66f75f79941c6100";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sq/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sq/thunderbird-52.5.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "e7a21ce516318f46d467f987dd244174ed2533bdeeeba41c2fff3a838ebb78047febabe6f3e86ab57bcc12f0b1418fb7ac195ca044a7c84eda404e152690b554";
+      sha512 = "f2dd5958774c81710aa59d7c9cf8543c86d82cd21da16b13ad1580cb2680df5caf973cf28a505fb994ad809264deeceea8806641fa27b9df5a7f26c725030515";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sr/thunderbird-52.5.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "132fbcd2a7890ac413dbc3b1651a02227b741a8a31e2406780f36415fd47ed75503968a93414ec31384f28ecf1e14753f0e1bb2988468d973dfac9ab45787519";
+      sha512 = "47a96a821fb825b6624262bbc0138027b842a9a69985af8903a7bfd435f6cbd3211e382899f3cc989cf716759aad927a8be22b2500f42f75362cfad09dbe67fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sv-SE/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sv-SE/thunderbird-52.5.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6e07841987bba5fcd69f790fc8a292ad7a3d71bcd802d16081145f243a71d49c8c57c5b6ad60ebfe1a550d62b1c9713843a83066893a397889f925e8b88904ef";
+      sha512 = "978c8c41034137361663f2b12818477baac0e795e4c1ca7f7a013a8e1bb68534ef2a8a9d73e31c1ded7461bc5dc6298fc628dc6190b3657ce415f9687a3ed85e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ta-LK/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ta-LK/thunderbird-52.5.2.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "978b1ba5f77271906ea67b37637b31a9c1da0f97453ea4e140adff8558ee2b01fe32f3018a48b141198cd0ad9f9d927ce213100be3f3310b020bfb3ff8b1d69c";
+      sha512 = "970405c59d2589e49c53f0ab37e959c6f3b94bac41929ac6d5776c7b78b91bc0f8a6c1acee1557338b76bb8fc2a9f62f179a0ad10a0a8c984254d39577402556";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/tr/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/tr/thunderbird-52.5.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2531185c167e66b77c6b7f968927a64a9e8de56580fd82c7b2408bfac71523738610b740650644eeee4c485dbf532a8da92367bdc574733d0df0d749613bd6b4";
+      sha512 = "cec76a997708b5339d5e49baea40125226f4bd708fa57f43f7812e2c7be686515986b90ab6ee525dadcaccbd9b9ea2c961e1a645b2c9634062e3e0c9c00ce2dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/uk/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/uk/thunderbird-52.5.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "3f9eed73e2e85528deef2f2ffcbc166d2a836d363693f6ece98adeabe872a6aaa77facd16efd918fac9eefebed68ff35c59750d7116545a6540c9e1aede45c51";
+      sha512 = "be710c5a5d28b34136ad72456ab9893d7c31dc0f3eea8cfc38d70169c37df5c96fb3aa18b72555e081115d0791f3a634325da191ac004ffc6a38d1412e140e95";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/vi/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/vi/thunderbird-52.5.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "fa776aca6c434491925e6fcd1802f047fcdcc2ae817805ffae0c873e17f1ad233836954544d85ac378ab28fb607c9cbc5b1808a12bbfa1d9337c8e47de4eddd7";
+      sha512 = "7d1f59f1fd78609700b6d6246087b88c5190139c79e7e60f2eaba91908ff0afbac0bce0e2a60594cda0800cf68ab0b5568702e0cfcfd1718e4cf46a88f20bc01";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-CN/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-CN/thunderbird-52.5.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ddc20a6b05b48d6bcbc59c585b4a2365cee6d526ddef29e3dd04d38c8632c5c7ddda9eab24f2850dd2614bb7acc6e982ae4673c2b51c679eb5afd48047bf6fca";
+      sha512 = "5763d93646a83b8a88e8c4b1c1c72101831f72323b600d576619330e2cf77ac7a9dc668aef5ef59188e0f467db900d1d8f3c2ef299f422f83de51f53519c70be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-TW/thunderbird-52.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-TW/thunderbird-52.5.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "aa527aeaa6b10d785e3fa3a8052c5dfa70f9aae2601119aed7dfd60e8af30f03cc1b4d93f749c36be4e54bbce6071fe66fb1937fa392b8391ca695e55ffe68ab";
+      sha512 = "cd593b08ed5f31dd89b44e9b79b1db324c51facf63e9d9c0c2ad847b9cc13a0548e831a87078c9c0ae910512c4855e6f3ae22d1c40189e082ff6ff26224c35b4";
     }
     ];
 }

From 62c5b716bccd701c75b52a43112c25c4ae8df4ed Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 22 Dec 2017 15:12:57 +0900
Subject: [PATCH 34/78] thunderbird: 52.5.0 -> 52.5.2

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 966e1886f34b..720b20e71290 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.5.0";
+  version = "52.5.2";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319";
+    sha512 = "d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff";
   };
 
   # New sed no longer tolerates this mistake.

From 8b69791230943da18c7d00a10117a0f39da29ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 22 Dec 2017 08:53:20 +0100
Subject: [PATCH 35/78] abcmidi: 2017.12.10 -> 2017.12.20

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 49647aafc11b..8113b67db88b 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2017.12.10";
+  version = "2017.12.20";
 
   # You can find new releases on http://ifdo.ca/~seymour/runabc/top.html
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0m6mv6hlpzg14y5vsjicvi6lpmymsi1q4wz8sfliric3n1zb7ygz";
+    sha256 = "0lkbwrh701djbyqmybvx860p8csy25i6p3p7hr0cpndpa496nm07";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 4ef36bf65494b6f0117dec6d238ac4575461d6b0 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 22 Dec 2017 00:20:11 -0500
Subject: [PATCH 36/78] winusb: unstable-2017-01-30 -> woeusb 3.1.4

WinUSB was renamed to WoeUSB
(https://github.com/slacka/WoeUSB/issues/100).

Also, put mount points in /run instead of /tmp to sidestep security
considerations with /tmp.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/tools/misc/winusb/default.nix | 35 ------------------
 pkgs/tools/misc/woeusb/default.nix | 57 ++++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  2 +-
 4 files changed, 59 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/tools/misc/winusb/default.nix
 create mode 100644 pkgs/tools/misc/woeusb/default.nix

diff --git a/pkgs/tools/misc/winusb/default.nix b/pkgs/tools/misc/winusb/default.nix
deleted file mode 100644
index b99d77dd70fc..000000000000
--- a/pkgs/tools/misc/winusb/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper
-, parted, grub2_light, p7zip
-, wxGTK30, gksu }:
-
-stdenv.mkDerivation rec {
-  name = "winusb-unstable-2017-01-30";
-
-  src = fetchFromGitHub {
-    owner = "slacka";
-    repo = "WinUSB";
-    rev = "599f00cdfd5c931056c576e4b2ae04d9285c4192";
-    sha256 = "1219425d1m4463jy85nrc5xz5qy5m8svidbiwnqicy7hp8pdwa7x";
-  };
-
-  buildInputs = [ wxGTK30 makeWrapper ];
-
-  postInstall = ''
-    # don't write data into /
-    substituteInPlace $out/bin/winusb \
-      --replace /media/ /tmp/winusb/
-
-    wrapProgram $out/bin/winusb \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ parted grub2_light p7zip ]}
-    wrapProgram $out/bin/winusbgui \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ gksu ]}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Create bootable USB disks from Windows ISO images";
-    homepage = https://github.com/slacka/WinUSB;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ bjornfor gnidorah ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
new file mode 100644
index 000000000000..436a252e678d
--- /dev/null
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
+, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget
+, wxGTK30 }:
+
+stdenv.mkDerivation rec {
+  version = "3.1.4";
+  name = "woeusb-${version}";
+
+  src = fetchFromGitHub {
+    owner = "slacka";
+    repo = "WoeUSB";
+    rev = "v${version}";
+    sha256 = "0hvxsm6k6s29wnr3i5b9drf6ml0i32is2l50l3cxvf1f499w4bpc";
+  };
+
+  buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];
+
+  postPatch = ''
+    # Emulate version smudge filter (see .gitattributes, .gitconfig).
+    for file in configure.ac debian/changelog src/woeusb src/woeusb.1 src/woeusbgui.1; do
+      substituteInPlace "$file" \
+        --replace '@@WOEUSB_VERSION@@' '${version}'
+    done
+
+    substituteInPlace src/MainPanel.cpp \
+      --replace "'woeusb " "'$out/bin/woeusb "
+  '';
+
+  postInstall = ''
+    # don't write data into /
+    substituteInPlace "$out/bin/woeusb" \
+      --replace /media/ /run/woeusb/
+
+    # woeusbgui launches woeusb with pkexec, which sets
+    # PATH=/usr/sbin:/usr/bin:/sbin:/bin:/root/bin.  Perhaps pkexec
+    # should be patched with a less useless default PATH, but for now
+    # we add everything we need manually.
+    wrapProgram "$out/bin/woeusb" \
+      --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}'
+  '';
+
+  doInstallCheck = true;
+
+  postInstallCheck = ''
+    # woeusb --version checks for missing runtime dependencies.
+    out_version="$("$out/bin/woeusb" --version)"
+    [ "$out_version" = '${version}' ]
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Create bootable USB disks from Windows ISO images";
+    homepage = https://github.com/slacka/WoeUSB;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ bjornfor gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba22d0ff42e6..37d764205099 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -160,6 +160,7 @@ mapAliases (rec {
   vimprobable2Wrapper = vimprobable2; # added 2015-01
   virtviewer = virt-viewer; # added 2015-12-24
   vorbisTools = vorbis-tools; # added 2016-01-26
+  winusb = woeusb; # added 2017-12-22
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30b7b594cce0..944cdcda8faf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5216,7 +5216,7 @@ with pkgs;
 
   which = callPackage ../tools/system/which { };
 
-  winusb = callPackage ../tools/misc/winusb { };
+  woeusb = callPackage ../tools/misc/woeusb { };
 
   chase = callPackage ../tools/system/chase { };
 

From 901f434cbc211e604f16179fd46b5fa77423c16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 22 Dec 2017 09:10:07 +0100
Subject: [PATCH 37/78] qmapshack: 1.9.1 -> 1.10.0

---
 pkgs/applications/misc/qmapshack/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index c67dcea40b9b..bc09d0b4d0ac 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
 
 stdenv.mkDerivation rec {
   name = "qmapshack-${version}";
-  version = "1.9.1";
+  version = "1.10.0";
 
-  src = fetchFromBitbucket {
-    owner = "maproom";
-    repo = "qmapshack";
-    rev = "V%20${version}";
-    sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
+  src = fetchurl {
+    url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+    sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw";
   };
 
   nativeBuildInputs = [ cmake ];

From dc29a90415088943dcc48657687d96fd1b94469f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 22 Dec 2017 06:51:51 -0200
Subject: [PATCH 38/78] tint2: 15.3 -> 16.0

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

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 2c23ab9261f6..2bd8b07e4995 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "15.3";
+  version = "16.0";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91";
+    sha256 = "04h32f9yybxb2v6bwmlyjzr8gg8jv4iidhpwaq3zhg44iz2b75j0";
   };
 
   enableParallelBuilding = true;

From 4cc9886d79aae670a9f987f91b49742dfce670dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 22 Dec 2017 07:06:27 -0200
Subject: [PATCH 39/78] vicious: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 67efedc2bcbc..c83e62fd89a5 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -717,13 +717,13 @@ let
 
   vicious = stdenv.mkDerivation rec {
     name = "vicious-${version}";
-    version = "2.3.0";
+    version = "2.3.1";
 
     src = fetchFromGitHub {
       owner = "Mic92";
       repo = "vicious";
       rev = "v${version}";
-      sha256 = "1mrd8c46ljilag8dljvnagaxnjnab8bmg9mcbnwvrivgjzgf6a1k";
+      sha256 = "1yzhjn8rsvjjsfycdc993ms6jy2j5jh7x3r2ax6g02z5n0anvnbx";
     };
 
     buildInputs = [ lua ];
@@ -735,7 +735,7 @@ let
     '';
 
     meta = with stdenv.lib; {
-      description = "Vicious widgets for window managers";
+      description = "A modular widget library for the awesome window manager";
       homepage    = https://github.com/Mic92/vicious;
       license     = licenses.gpl2;
       maintainers = with maintainers; [ makefu mic92 ];

From 9d1a524157e34b93ca6037c580ab3745c8f62c16 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 22 Dec 2017 13:51:09 +0200
Subject: [PATCH 40/78] zstd: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index aad9421305eb..b28311657a1c 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
-    sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz";
+    sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";

From e6c3dcfcf7ef39335a2462040b364e653dfb5574 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Dec 2017 13:54:13 +0100
Subject: [PATCH 41/78] android-studio: 3.0.0.18 -> 3.0.1.0

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index e8298720c22a..70078e7c60a4 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
 in rec {
   stable = mkStudio {
     pname = "android-studio";
-    version = "3.0.0.18"; # "Android Studio 3.0"
-    build = "171.4408382";
-    sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
+    version = "3.0.1.0"; # "Android Studio 3.0.1"
+    build = "171.4443003";
+    sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
 
     meta = with stdenv.lib; {
       description = "The Official IDE for Android (stable version)";

From bd424fdce942f84ec7cede939601964f127105c9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 09:01:03 -0500
Subject: [PATCH 42/78] ghc-exactprint: Fix build on GHC-8.2

---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 1522e42d6e66..2d3833fb2d88 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -71,4 +71,8 @@ self: super: {
   # https://github.com/aristidb/aws/issues/238
   aws = doJailbreak super.aws;
 
+  # Upstream failed to distribute the testsuite for 8.2
+  # https://github.com/alanz/ghc-exactprint/pull/60
+  ghc-exactprint = dontCheck super.ghc-exactprint;
+
 }

From 302202ccdeae887e776aa7d920eca5c9d34aa5ff Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 09:11:41 -0500
Subject: [PATCH 43/78] haskellPackages.monad-memo: Fix testsuite

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 844d8db4189f..e69309d91ce7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -997,4 +997,12 @@ self: super: {
   # See https://github.com/haskell/haddock/issues/679
   language-puppet = dontHaddock super.language-puppet;
 
+  # Missing FlexibleContexts in testsuite
+  # https://github.com/EduardSergeev/monad-memo/pull/4
+  monad-memo =
+    let patch = pkgs.fetchpatch
+          { url = https://github.com/EduardSergeev/monad-memo/pull/4.patch;
+            sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj";
+          };
+    in appendPatch super.monad-memo patch;
 }

From 7f410df1c6bdd81cf1914cb3562d0217edc3ee6a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 09:16:12 -0500
Subject: [PATCH 44/78] haskell-modules: Request older haddock-library to match
 haddock-api.

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 040c6f8f03fa..1dfd973c4469 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2681,6 +2681,7 @@ extra-packages:
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
+  - haddock-library == 1.4.4            # required for haddock-api-2.18.x
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode

From ef1accae91e490fc7c371f0d0ef50c57f385b232 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 03:02:17 +0000
Subject: [PATCH 45/78] chrootenv: print sysctl command for Debian users, fixes
 #32876

---
 .../build-fhs-userenv/chrootenv.c              | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c
index 8d6c98959cc9..97e69b7d0b22 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv.c
@@ -98,10 +98,12 @@ int nftw_rm(const char *path, const struct stat *sb, int type,
 
 #define LEN(x) sizeof(x) / sizeof(*x)
 
+#define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
+
 int main(int argc, char *argv[]) {
   if (argc < 2) {
     fprintf(stderr, "Usage: %s command [arguments...]\n"
-                    "Requires Linux kernel >= 3.19 with CONFIG_USER_NS.\n",
+                    "Requires " REQUIREMENTS ".\n",
             argv[0]);
     exit(EX_USAGE);
   }
@@ -128,7 +130,7 @@ int main(int argc, char *argv[]) {
     // If we are root, no need to create new user namespace.
     if (uid == 0) {
       if (unshare(CLONE_NEWNS) < 0)
-        errorf(EX_OSERR, "unshare() failed: You may have an old kernel or have CLONE_NEWUSER disabled by your distribution security settings.");
+        errorf(EX_OSERR, "unshare: requires " REQUIREMENTS);
       // Mark all mounted filesystems as slave so changes
       // don't propagate to the parent mount namespace.
       if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL) < 0)
@@ -136,8 +138,13 @@ int main(int argc, char *argv[]) {
     } else {
       // Create new mount and user namespaces. CLONE_NEWUSER
       // requires a program to be non-threaded.
-      if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0)
-        errorf(EX_OSERR, "unshare");
+      if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) {
+        if (access("/tmp/proc/sys/kernel/unprivileged_userns_clone", F_OK) < 0)
+          errorf(EX_OSERR, "unshare: requires " REQUIREMENTS);
+        else
+          errorf(EX_OSERR, "unshare: run `sudo sysctl -w "
+                           "kernel.unprivileged_userns_clone=1`");
+      }
 
       // Map users and groups to the parent namespace.
       // setgroups is only available since Linux 3.19:
@@ -170,7 +177,8 @@ int main(int argc, char *argv[]) {
   if (waitpid(cpid, &status, 0) < 0)
     errorf(EX_OSERR, "waitpid");
 
-  if (nftw(root, nftw_rm, getdtablesize(), FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0)
+  if (nftw(root, nftw_rm, getdtablesize(), FTW_DEPTH | FTW_MOUNT | FTW_PHYS) <
+      0)
     errorf(EX_IOERR, "nftw");
 
   if (WIFEXITED(status))

From c03663a14517ed495b6d01418ef47dd1278c611d Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 12:59:11 +0000
Subject: [PATCH 46/78] chrootenv: bind-mount all dirs in /, symlink files,
 closes #32877

---
 .../build-fhs-userenv/chrootenv.c             | 93 ++++++++++++++-----
 1 file changed, 69 insertions(+), 24 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c
index 97e69b7d0b22..3567a8d1048d 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv.c
@@ -10,6 +10,7 @@
 #include <ftw.h>
 #include <sched.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,33 +44,80 @@ char **env_build(char *names[], size_t len) {
   return ret;
 }
 
-struct bind {
-  char *from;
-  char *to;
-};
+void bind(char *from, char *to) {
+  if (mkdir(to, 0755) < 0)
+    errorf(EX_IOERR, "mkdir");
 
-struct bind binds[] = {{"/", "host"},   {"/proc", "proc"}, {"/sys", "sys"},
-                       {"/nix", "nix"}, {"/tmp", "tmp"},   {"/var", "var"},
-                       {"/run", "run"}, {"/dev", "dev"},   {"/home", "home"}};
+  if (mount(from, to, "bind", MS_BIND | MS_REC, NULL) < 0)
+    errorf(EX_OSERR, "mount");
+}
 
-void bind(struct bind *bind) {
-  DIR *src = opendir(bind->from);
+char *strjoin(char *dir, char *name) {
+  char *path = malloc(strlen(dir) + strlen(name) + 1);
 
-  if (src) {
-    if (closedir(src) < 0)
-      errorf(EX_IOERR, "closedir");
+  if (path == NULL)
+    errorf(EX_OSERR, "malloc");
 
-    if (mkdir(bind->to, 0755) < 0)
-      errorf(EX_IOERR, "mkdir");
+  if (strcpy(path, dir) < 0)
+    errorf(EX_IOERR, "strcpy");
 
-    if (mount(bind->from, bind->to, "bind", MS_BIND | MS_REC, NULL) < 0)
-      errorf(EX_OSERR, "mount");
+  if (strcat(path, name) < 0)
+    errorf(EX_IOERR, "strcat");
 
-  } else {
-    // https://github.com/NixOS/nixpkgs/issues/31104
-    if (errno != ENOENT)
-      errorf(EX_OSERR, "opendir");
+  return path;
+}
+
+#define LEN(x) sizeof(x) / sizeof(*x)
+
+char *bind_blacklist[] = {".", "..", "bin", "etc", "host", "usr"};
+
+bool bind_blacklisted(char *name) {
+  for (size_t i = 0; i < LEN(bind_blacklist); i++) {
+    if (!strcmp(bind_blacklist[i], name))
+      return true;
   }
+
+  return false;
+}
+
+bool isdir(char *path) {
+  struct stat buf;
+  stat(path, &buf);
+  return S_ISDIR(buf.st_mode);
+}
+
+void bind_to_cwd(char *prefix) {
+  DIR *prefix_dir = opendir(prefix);
+
+  if (prefix_dir == NULL)
+    errorf(EX_OSERR, "opendir");
+
+  struct dirent *prefix_dirent;
+
+  while (prefix_dirent = readdir(prefix_dir)) {
+    if (bind_blacklisted(prefix_dirent->d_name))
+      continue;
+
+    char *prefix_dirent_path = strjoin(prefix, prefix_dirent->d_name);
+
+    if (isdir(prefix_dirent_path)) {
+      bind(prefix_dirent_path, prefix_dirent->d_name);
+    } else {
+      char *host_target = strjoin("host/", prefix_dirent->d_name);
+
+      if (symlink(host_target, prefix_dirent->d_name) < 0)
+        errorf(EX_IOERR, "symlink");
+
+      free(host_target);
+    }
+
+    free(prefix_dirent_path);
+  }
+
+  bind(prefix, "host");
+
+  if (closedir(prefix_dir) < 0)
+    errorf(EX_IOERR, "closedir");
 }
 
 void spitf(char *path, char *fmt, ...) {
@@ -96,8 +144,6 @@ int nftw_rm(const char *path, const struct stat *sb, int type,
   return 0;
 }
 
-#define LEN(x) sizeof(x) / sizeof(*x)
-
 #define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
 
 int main(int argc, char *argv[]) {
@@ -157,8 +203,7 @@ int main(int argc, char *argv[]) {
     if (chdir(root) < 0)
       errorf(EX_IOERR, "chdir");
 
-    for (size_t i = 0; i < LEN(binds); i++)
-      bind(&binds[i]);
+    bind_to_cwd("/");
 
     if (chroot(root) < 0)
       errorf(EX_OSERR, "chroot");

From 0234cd41b4458caeb722d0b2de55be23a1e5af15 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 15:30:47 +0000
Subject: [PATCH 47/78] chrootenv: replace env whitelist with blacklist, closes
 #32878

---
 .../build-fhs-userenv/chrootenv.c             | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c
index 3567a8d1048d..73c8763c0485 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv.c
@@ -21,27 +21,38 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-char *env_whitelist[] = {"TERM",
-                         "DISPLAY",
-                         "XAUTHORITY",
-                         "HOME",
-                         "XDG_RUNTIME_DIR",
-                         "LANG",
-                         "SSL_CERT_FILE",
-                         "DBUS_SESSION_BUS_ADDRESS"};
+#define LEN(x) sizeof(x) / sizeof(*x)
 
-char **env_build(char *names[], size_t len) {
-  char *env, **ret = malloc((len + 1) * sizeof(char *)), **ptr = ret;
+char *env_blacklist[] = {};
 
-  for (size_t i = 0; i < len; i++) {
-    if ((env = getenv(names[i]))) {
-      if (asprintf(ptr++, "%s=%s", names[i], env) < 0)
-        errorf(EX_OSERR, "asprintf");
+char **env_filter(char *envp[]) {
+  char **filtered_envp = malloc(sizeof(*envp));
+  size_t n = 0;
+
+  while (*envp != NULL) {
+    bool blacklisted = false;
+
+    for (size_t i = 0; i < LEN(env_blacklist); i++) {
+      if (!strncmp(*envp, env_blacklist[i], strlen(env_blacklist[i]))) {
+        blacklisted = true;
+        break;
+      }
     }
+
+    if (!blacklisted) {
+      filtered_envp = realloc(filtered_envp, (n + 2) * sizeof(*envp));
+
+      if (filtered_envp == NULL)
+        errorf(EX_OSERR, "realloc");
+
+      filtered_envp[n++] = *envp;
+    }
+
+    envp++;
   }
 
-  *ptr = NULL;
-  return ret;
+  filtered_envp[n] = NULL;
+  return filtered_envp;
 }
 
 void bind(char *from, char *to) {
@@ -67,8 +78,6 @@ char *strjoin(char *dir, char *name) {
   return path;
 }
 
-#define LEN(x) sizeof(x) / sizeof(*x)
-
 char *bind_blacklist[] = {".", "..", "bin", "etc", "host", "usr"};
 
 bool bind_blacklisted(char *name) {
@@ -146,7 +155,7 @@ int nftw_rm(const char *path, const struct stat *sb, int type,
 
 #define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[], char *envp[]) {
   if (argc < 2) {
     fprintf(stderr, "Usage: %s command [arguments...]\n"
                     "Requires " REQUIREMENTS ".\n",
@@ -213,7 +222,7 @@ int main(int argc, char *argv[]) {
 
     argv++;
 
-    if (execvpe(*argv, argv, env_build(env_whitelist, LEN(env_whitelist))) < 0)
+    if (execvpe(*argv, argv, env_filter(envp)) < 0)
       errorf(EX_OSERR, "execvpe");
   }
 

From 710662be948d9013390241469c877dc97ca19e1a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 20 Dec 2017 19:32:17 +0000
Subject: [PATCH 48/78] chrootenv: error on chrootenv-inside-chrootenv,
 resolves #32802

---
 pkgs/build-support/build-fhs-userenv/chrootenv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c
index 73c8763c0485..d88fc045377d 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv.c
@@ -155,7 +155,9 @@ int nftw_rm(const char *path, const struct stat *sb, int type,
 
 #define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
 
-int main(int argc, char *argv[], char *envp[]) {
+extern char **environ;
+
+int main(int argc, char *argv[]) {
   if (argc < 2) {
     fprintf(stderr, "Usage: %s command [arguments...]\n"
                     "Requires " REQUIREMENTS ".\n",
@@ -163,6 +165,12 @@ int main(int argc, char *argv[], char *envp[]) {
     exit(EX_USAGE);
   }
 
+  if (getenv("NIX_CHROOTENV") != NULL)
+    errorf(EX_USAGE, "can't create chrootenv inside chrootenv");
+
+  if (setenv("NIX_CHROOTENV", "1", false) < 0)
+    errorf(EX_IOERR, "setenv");
+
   char tmpl[] = "/tmp/chrootenvXXXXXX";
   char *root = mkdtemp(tmpl);
 
@@ -222,7 +230,7 @@ int main(int argc, char *argv[], char *envp[]) {
 
     argv++;
 
-    if (execvpe(*argv, argv, env_filter(envp)) < 0)
+    if (execvpe(*argv, argv, env_filter(environ)) < 0)
       errorf(EX_OSERR, "execvpe");
   }
 

From 73a0d95b96d9aecc9c0ed6fa4407e1537170db53 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 21 Dec 2017 02:58:58 +0000
Subject: [PATCH 49/78] chrootenv: code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Wrap LEN macro in parantheses
* Drop env_filter in favor of stateful environ_blacklist_filter,
  use execvp instead of execvpe, don't explicitly use environ
* Add argument error logging wherever it makes sense
* Drop strjoin in favor of asprintf
* char* -> const char* where appropriate
* Handle stat errors
* Print user messages with fputs, not errorf
* Abstract away is_str_in (previously bind_blacklisted)
* Cleanup temporary directory on error
* Some minor syntactic and naming changes

Thanks to Jörg Thalheim and Tuomas Tynkkynen for the code review!
---
 .../build-fhs-userenv/chrootenv.c             | 190 +++++++++---------
 1 file changed, 90 insertions(+), 100 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c
index d88fc045377d..d3b49db0e42d 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv.c
@@ -21,101 +21,75 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#define LEN(x) sizeof(x) / sizeof(*x)
+#define LEN(x) (sizeof(x) / sizeof(*x))
 
-char *env_blacklist[] = {};
+// TODO: fill together with @abbradar when he gets better
+const char *environ_blacklist[] = {};
 
-char **env_filter(char *envp[]) {
-  char **filtered_envp = malloc(sizeof(*envp));
-  size_t n = 0;
-
-  while (*envp != NULL) {
-    bool blacklisted = false;
-
-    for (size_t i = 0; i < LEN(env_blacklist); i++) {
-      if (!strncmp(*envp, env_blacklist[i], strlen(env_blacklist[i]))) {
-        blacklisted = true;
-        break;
-      }
-    }
-
-    if (!blacklisted) {
-      filtered_envp = realloc(filtered_envp, (n + 2) * sizeof(*envp));
-
-      if (filtered_envp == NULL)
-        errorf(EX_OSERR, "realloc");
-
-      filtered_envp[n++] = *envp;
-    }
-
-    envp++;
+void environ_blacklist_filter() {
+  for (size_t i = 0; i < LEN(environ_blacklist); i++) {
+    if (unsetenv(environ_blacklist[i]) < 0)
+      errorf(EX_OSERR, "unsetenv(%s)", environ_blacklist[i]);
   }
-
-  filtered_envp[n] = NULL;
-  return filtered_envp;
 }
 
-void bind(char *from, char *to) {
+void bind(const char *from, const char *to) {
   if (mkdir(to, 0755) < 0)
-    errorf(EX_IOERR, "mkdir");
+    errorf(EX_IOERR, "mkdir(%s)", to);
 
   if (mount(from, to, "bind", MS_BIND | MS_REC, NULL) < 0)
-    errorf(EX_OSERR, "mount");
+    errorf(EX_OSERR, "mount(%s, %s)", from, to);
 }
 
-char *strjoin(char *dir, char *name) {
-  char *path = malloc(strlen(dir) + strlen(name) + 1);
+const char *bind_blacklist[] = {".", "..", "bin", "etc", "host", "usr"};
 
-  if (path == NULL)
-    errorf(EX_OSERR, "malloc");
-
-  if (strcpy(path, dir) < 0)
-    errorf(EX_IOERR, "strcpy");
-
-  if (strcat(path, name) < 0)
-    errorf(EX_IOERR, "strcat");
-
-  return path;
-}
-
-char *bind_blacklist[] = {".", "..", "bin", "etc", "host", "usr"};
-
-bool bind_blacklisted(char *name) {
-  for (size_t i = 0; i < LEN(bind_blacklist); i++) {
-    if (!strcmp(bind_blacklist[i], name))
+bool str_contains(const char *needle, const char **haystack, size_t len) {
+  for (size_t i = 0; i < len; i++) {
+    if (!strcmp(needle, haystack[i]))
       return true;
   }
 
   return false;
 }
 
-bool isdir(char *path) {
+bool is_dir(const char *path) {
   struct stat buf;
-  stat(path, &buf);
+
+  if (stat(path, &buf) < 0)
+    errorf(EX_IOERR, "stat(%s)", path);
+
   return S_ISDIR(buf.st_mode);
 }
 
-void bind_to_cwd(char *prefix) {
+void bind_to_cwd(const char *prefix) {
   DIR *prefix_dir = opendir(prefix);
 
   if (prefix_dir == NULL)
-    errorf(EX_OSERR, "opendir");
+    errorf(EX_IOERR, "opendir(%s)", prefix);
 
   struct dirent *prefix_dirent;
 
   while (prefix_dirent = readdir(prefix_dir)) {
-    if (bind_blacklisted(prefix_dirent->d_name))
+    if (str_contains(prefix_dirent->d_name, bind_blacklist,
+                     LEN(bind_blacklist)))
       continue;
 
-    char *prefix_dirent_path = strjoin(prefix, prefix_dirent->d_name);
+    char *prefix_dirent_path;
 
-    if (isdir(prefix_dirent_path)) {
+    if (asprintf(&prefix_dirent_path, "%s%s", prefix, prefix_dirent->d_name) <
+        0)
+      errorf(EX_IOERR, "asprintf");
+
+    if (is_dir(prefix_dirent_path)) {
       bind(prefix_dirent_path, prefix_dirent->d_name);
     } else {
-      char *host_target = strjoin("host/", prefix_dirent->d_name);
+      char *host_target;
+
+      if (asprintf(&host_target, "host/%s", prefix_dirent->d_name) < 0)
+        errorf(EX_IOERR, "asprintf");
 
       if (symlink(host_target, prefix_dirent->d_name) < 0)
-        errorf(EX_IOERR, "symlink");
+        errorf(EX_IOERR, "symlink(%s, %s)", host_target, prefix_dirent->d_name);
 
       free(host_target);
     }
@@ -126,10 +100,10 @@ void bind_to_cwd(char *prefix) {
   bind(prefix, "host");
 
   if (closedir(prefix_dir) < 0)
-    errorf(EX_IOERR, "closedir");
+    errorf(EX_IOERR, "closedir(%s)", prefix);
 }
 
-void spitf(char *path, char *fmt, ...) {
+void spitf(const char *path, char *fmt, ...) {
   va_list args;
   va_start(args, fmt);
 
@@ -145,41 +119,58 @@ void spitf(char *path, char *fmt, ...) {
     errorf(EX_IOERR, "spitf(%s): fclose", path);
 }
 
-int nftw_rm(const char *path, const struct stat *sb, int type,
-            struct FTW *ftw) {
-  if (remove(path) < 0)
-    errorf(EX_IOERR, "nftw_rm");
-
-  return 0;
+int nftw_remove(const char *path, const struct stat *sb, int type,
+                struct FTW *ftw) {
+  return remove(path);
 }
 
-#define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
+char *root;
 
-extern char **environ;
+void root_cleanup() {
+  if (nftw(root, nftw_remove, getdtablesize(),
+           FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0)
+    errorf(EX_IOERR, "nftw(%s)", root);
+
+  free(root);
+}
+
+#define REQUIREMENTS                                                           \
+  "Requires Linux version >= 3.19 built with CONFIG_USER_NS option.\n"
 
 int main(int argc, char *argv[]) {
+  const char *self = *argv++;
+
   if (argc < 2) {
-    fprintf(stderr, "Usage: %s command [arguments...]\n"
-                    "Requires " REQUIREMENTS ".\n",
-            argv[0]);
+    fprintf(stderr, "Usage: %s command [arguments...]\n" REQUIREMENTS, self);
     exit(EX_USAGE);
   }
 
-  if (getenv("NIX_CHROOTENV") != NULL)
-    errorf(EX_USAGE, "can't create chrootenv inside chrootenv");
+  if (getenv("NIX_CHROOTENV") != NULL) {
+    fputs("Can't create chrootenv inside chrootenv!\n", stderr);
+    exit(EX_USAGE);
+  }
 
   if (setenv("NIX_CHROOTENV", "1", false) < 0)
-    errorf(EX_IOERR, "setenv");
+    errorf(EX_OSERR, "setenv(NIX_CHROOTENV, 1)");
 
-  char tmpl[] = "/tmp/chrootenvXXXXXX";
-  char *root = mkdtemp(tmpl);
+  const char *temp = getenv("TMPDIR");
+
+  if (temp == NULL)
+    temp = "/tmp";
+
+  if (asprintf(&root, "%s/chrootenvXXXXXX", temp) < 0)
+    errorf(EX_IOERR, "asprintf");
+
+  root = mkdtemp(root);
 
   if (root == NULL)
-    errorf(EX_IOERR, "mkdtemp");
+    errorf(EX_IOERR, "mkdtemp(%s)", root);
+
+  atexit(root_cleanup);
 
   // Don't make root private so that privilege drops inside chroot are possible:
   if (chmod(root, 0755) < 0)
-    errorf(EX_IOERR, "chmod");
+    errorf(EX_IOERR, "chmod(%s, 0755)", root);
 
   pid_t cpid = fork();
 
@@ -192,8 +183,10 @@ int main(int argc, char *argv[]) {
 
     // If we are root, no need to create new user namespace.
     if (uid == 0) {
-      if (unshare(CLONE_NEWNS) < 0)
-        errorf(EX_OSERR, "unshare: requires " REQUIREMENTS);
+      if (unshare(CLONE_NEWNS) < 0) {
+        fputs(REQUIREMENTS, stderr);
+        errorf(EX_OSERR, "unshare");
+      }
       // Mark all mounted filesystems as slave so changes
       // don't propagate to the parent mount namespace.
       if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL) < 0)
@@ -202,11 +195,11 @@ int main(int argc, char *argv[]) {
       // Create new mount and user namespaces. CLONE_NEWUSER
       // requires a program to be non-threaded.
       if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) {
-        if (access("/tmp/proc/sys/kernel/unprivileged_userns_clone", F_OK) < 0)
-          errorf(EX_OSERR, "unshare: requires " REQUIREMENTS);
-        else
-          errorf(EX_OSERR, "unshare: run `sudo sysctl -w "
-                           "kernel.unprivileged_userns_clone=1`");
+        fputs(access("/proc/sys/kernel/unprivileged_userns_clone", F_OK)
+                  ? REQUIREMENTS
+                  : "Run: sudo sysctl -w kernel.unprivileged_userns_clone=1\n",
+              stderr);
+        errorf(EX_OSERR, "unshare");
       }
 
       // Map users and groups to the parent namespace.
@@ -218,35 +211,32 @@ int main(int argc, char *argv[]) {
     }
 
     if (chdir(root) < 0)
-      errorf(EX_IOERR, "chdir");
+      errorf(EX_IOERR, "chdir(%s)", root);
 
     bind_to_cwd("/");
 
     if (chroot(root) < 0)
-      errorf(EX_OSERR, "chroot");
+      errorf(EX_OSERR, "chroot(%s)", root);
 
     if (chdir("/") < 0)
-      errorf(EX_OSERR, "chdir");
+      errorf(EX_IOERR, "chdir(/)");
 
-    argv++;
+    environ_blacklist_filter();
 
-    if (execvpe(*argv, argv, env_filter(environ)) < 0)
-      errorf(EX_OSERR, "execvpe");
+    if (execvp(*argv, argv) < 0)
+      errorf(EX_OSERR, "execvp(%s)", *argv);
   }
 
   int status;
 
   if (waitpid(cpid, &status, 0) < 0)
-    errorf(EX_OSERR, "waitpid");
+    errorf(EX_OSERR, "waitpid(%d)", cpid);
 
-  if (nftw(root, nftw_rm, getdtablesize(), FTW_DEPTH | FTW_MOUNT | FTW_PHYS) <
-      0)
-    errorf(EX_IOERR, "nftw");
-
-  if (WIFEXITED(status))
+  if (WIFEXITED(status)) {
     return WEXITSTATUS(status);
-  else if (WIFSIGNALED(status))
+  } else if (WIFSIGNALED(status)) {
     kill(getpid(), WTERMSIG(status));
+  }
 
   return EX_OSERR;
 }

From 02efc7600b831ec78231dc075c9ba37e70fec3c2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 11:43:09 -0500
Subject: [PATCH 50/78] gurobipy: Bump to 7.5.2

---
 .../python-modules/gurobipy/darwin.nix        | 14 ++---
 .../python-modules/gurobipy/linux.nix         |  9 +--
 .../gurobipy/no-clever-setup.patch            | 55 +++++++++++++++++++
 .../gurobipy/no-darwin-fixup.patch            | 20 -------
 4 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/python-modules/gurobipy/no-clever-setup.patch
 delete mode 100644 pkgs/development/python-modules/gurobipy/no-darwin-fixup.patch

diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix
index f5f06058fc75..65bec7d8b12e 100644
--- a/pkgs/development/python-modules/gurobipy/darwin.nix
+++ b/pkgs/development/python-modules/gurobipy/darwin.nix
@@ -1,10 +1,10 @@
 { fetchurl, python, xar, cpio, cctools, insert_dylib }:
 assert python.pkgs.isPy27 && python.ucsEncoding == 2;
 python.pkgs.buildPythonPackage
-  { name = "gurobipy-7.0.2";
+  { name = "gurobipy-7.5.2";
     src = fetchurl
-      { url = "http://packages.gurobi.com/7.0/gurobi7.0.2_mac64.pkg";
-        sha256 = "14dpxas6gx02kfb28i0fh68p1z4sbjmwg8hp8h5ch6c701h260mg";
+      { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg";
+        sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h";
       };
     buildInputs = [ xar cpio cctools insert_dylib ];
     unpackPhase =
@@ -15,7 +15,7 @@ python.pkgs.buildPythonPackage
         sourceRoot=$(echo gurobi*/*64)
         runHook postUnpack
       '';
-    patches = [ ./no-darwin-fixup.patch ];
+    patches = [ ./no-clever-setup.patch ];
     postInstall = "mv lib/lib*.so $out/lib";
     postFixup =
       ''
@@ -23,10 +23,10 @@ python.pkgs.buildPythonPackage
           /System/Library/Frameworks/Python.framework/Versions/2.7/Python \
           ${python}/lib/libpython2.7.dylib \
           $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
-        install_name_tool -change libgurobi70.so \
-          $out/lib/libgurobi70.so \
+        install_name_tool -change /Library/gurobi752/mac64/lib/libgurobi75.so \
+          $out/lib/libgurobi75.so \
           $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
-        insert_dylib --inplace $out/lib/libaes70.so \
+        insert_dylib --inplace $out/lib/libaes75.so \
           $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
       '';
   }
diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix
index 5010415d2c64..d78eff0b47a0 100644
--- a/pkgs/development/python-modules/gurobipy/linux.nix
+++ b/pkgs/development/python-modules/gurobipy/linux.nix
@@ -5,18 +5,19 @@ let utf =
   else if python.ucsEncoding == 4 then "32"
   else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
 in python.pkgs.buildPythonPackage
-  { name = "gurobipy-7.0.2";
+  { name = "gurobipy-7.5.2";
     src = fetchurl
-      { url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz";
-        sha256 = "1lgdj4cncjvnnw8dppiax7q2j8121pxyg9iryj8v26mrk778dnmn";
+      { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz";
+        sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj";
       };
     setSourceRoot = "sourceRoot=$(echo gurobi*/*64)";
+    patches = [ ./no-clever-setup.patch ];
     postInstall = "mv lib/libaes*.so* lib/libgurobi*.so* $out/lib";
     postFixup =
       ''
         patchelf --set-rpath $out/lib \
           $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
-        patchelf --add-needed libaes70.so \
+        patchelf --add-needed libaes75.so \
           $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
       '';
   }
diff --git a/pkgs/development/python-modules/gurobipy/no-clever-setup.patch b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch
new file mode 100644
index 000000000000..c71ac7d68632
--- /dev/null
+++ b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch
@@ -0,0 +1,55 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2017-12-22 10:52:43.730264611 -0500
++++ b/setup.py	2017-12-22 10:53:27.660104199 -0500
+@@ -15,30 +15,6 @@
+ from distutils.command.install import install
+ import os,sys,shutil
+ 
+-class GurobiClean(Command):
+-    description = "remove the build directory"
+-    user_options = []
+-    def initialize_options(self):
+-        self.cwd = None
+-    def finalize_options(self):
+-        self.cwd = os.path.dirname(os.path.realpath(__file__))
+-    def run(self):
+-        assert os.getcwd() == self.cwd, 'Must be run from setup.py directory: %s' % self.cwd
+-        build_dir = os.path.join(os.getcwd(), "build")
+-        if os.path.exists(build_dir):
+-            print('removing %s' % build_dir)
+-            shutil.rmtree(build_dir)
+-
+-class GurobiInstall(install):
+-
+-    # Calls the default run command, then deletes the build area
+-    # (equivalent to "setup clean --all").
+-    def run(self):
+-        install.run(self)
+-        c = GurobiClean(self.distribution)
+-        c.finalize_options()
+-        c.run()
+-
+ License = """
+     This software is covered by the Gurobi End User License Agreement.
+     By completing the Gurobi installation process and using the software,
+@@ -79,20 +55,4 @@
+       packages = ['gurobipy'],
+       package_dir={'gurobipy' : srcpath },
+       package_data = {'gurobipy' : [srcfile] },
+-      cmdclass={'install' : GurobiInstall, 
+-                'clean'   : GurobiClean }
+       )
+-
+-if os.name == 'posix' and sys.platform == 'darwin': # update Mac paths
+-  verstr = sys.version[:3]
+-  default = '/Library/Frameworks/Python.framework/Versions/%s/Python' % verstr
+-  default = '/System'+default if verstr == '2.7' else default
+-  modified = sys.prefix + '/Python'
+-  if default != modified:
+-    import subprocess
+-    from distutils.sysconfig import get_python_lib
+-    sitelib = get_python_lib() + '/gurobipy/gurobipy.so'
+-    if not os.path.isfile(modified): # Anaconda
+-      libver = verstr if verstr == '2.7' else verstr+'m'
+-      modified = sys.prefix + '/lib/libpython%s.dylib' % libver # For Anaconda
+-    subprocess.call(('install_name_tool', '-change', default, modified, sitelib))
diff --git a/pkgs/development/python-modules/gurobipy/no-darwin-fixup.patch b/pkgs/development/python-modules/gurobipy/no-darwin-fixup.patch
deleted file mode 100644
index c1ed8cb48886..000000000000
--- a/pkgs/development/python-modules/gurobipy/no-darwin-fixup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2017-12-18 12:48:02.000000000 -0500
-+++ b/setup.py	2017-12-18 12:48:43.000000000 -0500
-@@ -54,16 +54,3 @@
-       package_dir={'gurobipy' : srcpath },
-       package_data = {'gurobipy' : [srcfile] }
-       )
--
--if sys.platform == 'darwin':
--  from distutils.sysconfig import get_python_lib
--  import subprocess
--  import os.path
--  sitelib = get_python_lib() + '/gurobipy/gurobipy.so'
--  subprocess.call(('install_name_tool', '-change', 'libgurobi70.so', '/Library/gurobi702/mac64/lib/libgurobi70.so', sitelib)) # version for change
--  default = '/System/Library/Frameworks/Python.framework/Versions/2.7/Python'
--  modified = sys.prefix + '/Python'
--  if default != modified:
--    if not os.path.isfile(modified):
--      modified = sys.prefix + '/lib/libpython2.7.dylib' # For Anaconda
--    subprocess.call(('install_name_tool', '-change', default, modified, sitelib))

From 25576df64c30480df91844af019d626e0385c106 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 Dec 2017 16:56:20 +0000
Subject: [PATCH 51/78] coqPackages.contribs: recurse into the nested set

---
 pkgs/top-level/coq-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index fd960e03db61..fd6fc21c6804 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, newScope
+{ lib, callPackage, newScope, recurseIntoAttrs
 , gnumake3
 , ocamlPackages_3_12_1
 , ocamlPackages_4_02
@@ -10,6 +10,9 @@ let
       inherit callPackage coq;
       coqPackages = self;
 
+      contribs = recurseIntoAttrs
+        (callPackage ../development/coq-modules/contribs {});
+
       autosubst = callPackage ../development/coq-modules/autosubst {};
       bignums = if lib.versionAtLeast coq.coq-version "8.6"
         then callPackage ../development/coq-modules/bignums {}
@@ -33,11 +36,10 @@ let
       paco = callPackage ../development/coq-modules/paco {};
       QuickChick = callPackage ../development/coq-modules/QuickChick {};
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
-      contribs = callPackage ../development/coq-modules/contribs { };
     };
 
   filterCoqPackages = coq:
-    lib.filterAttrs
+    lib.filterAttrsRecursive
     (_: p:
       let pred = p.compatibleCoqVersions or (_: true);
       in pred coq.coq-version

From 24474528e42acedb96e5464a3270ce1c07e18a8a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 Dec 2017 17:07:25 +0000
Subject: [PATCH 52/78] coqPackages.contribs.containers: fix url

---
 pkgs/development/coq-modules/contribs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index e7ea6f9a911e..88ef8011aa8e 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -189,10 +189,10 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ ] {
-    version = "v8.6.0-10-g2432994";
-    rev = "2432994b4a0a63f28b21aad23d0c3c90c7630890";
-    sha256 = "1q0i20qag2c8jh6jw63s09d8nr6m1zaz4hqblg5mmmp5zh6fllk6";
+  containers = mkContrib "containers" [ "8.6" ] {
+    version = "8.6.0";
+    rev = "fa1fec7";
+    sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
   };
 
   continuations = mkContrib "continuations" [ ] {

From 5e8a0786b0565f4941dbd836550eabfc7c8fa3f3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 12:48:07 -0500
Subject: [PATCH 53/78] Disable tests on haskellPackages.protobuf

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e69309d91ce7..a08697a5792b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,4 +1005,7 @@ self: super: {
             sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj";
           };
     in appendPatch super.monad-memo patch;
+
+  # https://github.com/alphaHeavy/protobuf/issues/34
+  protobuf = dontCheck super.protobuf;
 }

From 4c66ebb0d1b2a195851b7c52658dc258c851df38 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 13:31:35 -0500
Subject: [PATCH 54/78] hadoop-rpc: Fix build on ghc 8.2

---
 .../haskell-modules/configuration-ghc-8.2.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 2d3833fb2d88..b42bc8ff3428 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -75,4 +75,13 @@ self: super: {
   # https://github.com/alanz/ghc-exactprint/pull/60
   ghc-exactprint = dontCheck super.ghc-exactprint;
 
+  # Reduction stack overflow; size = 38
+  # https://github.com/jystic/hadoop-tools/issues/31
+  hadoop-rpc =
+    let patch = pkgs.fetchpatch
+          { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch;
+            sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp";
+            stripLen = 1;
+          };
+    in appendPatch super.hadoop-rpc patch;
 }

From e32bc0b5c04f0080b4c8505649921e5f7e8d6a5f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 13:54:01 -0500
Subject: [PATCH 55/78] haskellPackages.lenz: Fix against latest hs-functors

---
 .../haskell-modules/configuration-common.nix          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a08697a5792b..58de439d839c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1008,4 +1008,15 @@ self: super: {
 
   # https://github.com/alphaHeavy/protobuf/issues/34
   protobuf = dontCheck super.protobuf;
+
+  # https://github.com/strake/lenz.hs/issues/2
+  lenz =
+    let patch = pkgs.fetchpatch
+          { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
+            sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
+          };
+    in overrideCabal super.lenz (drv:
+      { patches = (drv.patches or []) ++ [ patch ];
+        editedCabalFile = null;
+      });
 }

From ea9b677046fb0f9056279aa3f675025526b0cc6e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 22 Dec 2017 14:04:59 -0500
Subject: [PATCH 56/78] haskellPackages.coordinate: Fix build on ghc 8.2

---
 .../haskell-modules/configuration-ghc-8.2.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index b42bc8ff3428..e6ba886032b7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -84,4 +84,13 @@ self: super: {
             stripLen = 1;
           };
     in appendPatch super.hadoop-rpc patch;
+
+  # Custom Setup.hs breaks with Cabal 2
+  # https://github.com/NICTA/coordinate/pull/4
+  coordinate =
+    let patch = pkgs.fetchpatch
+          { url = https://github.com/NICTA/coordinate/pull/4.patch;
+            sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy";
+          };
+    in appendPatch super.coordinate patch;
 }

From fd45c14b3802f0301569673814d4e0f1a7340883 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 21 Dec 2017 11:35:32 -0800
Subject: [PATCH 57/78] python-bitcoinlib: init at 0.9.0

Signed-off-by: William Casarin <jb55@jb55.com>, @jb55
---
 .../python-modules/bitcoinlib/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/bitcoinlib/default.nix

diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix
new file mode 100644
index 000000000000..99d943862aba
--- /dev/null
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, openssl }:
+
+buildPythonPackage rec {
+  pname = "bitcoinlib";
+  version = "0.9.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "petertodd";
+    rev    = "7a8a47ec6b722339de1d0a8144e55b400216f90f";
+    repo   = "python-bitcoinlib";
+    sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z";
+  };
+
+  postPatch = ''
+    substituteInPlace bitcoin/core/key.py --replace \
+      "ctypes.util.find_library('ssl') or 'libeay32'" \
+      "\"${openssl.out}/lib/libssl.so\""
+  '';
+
+  meta = {
+    homepage = src.meta.homepage;
+    description = "Easy interface to the Bitcoin data structures and protocol";
+    license = with lib.licenses; [ gpl3 ];
+    maintainers = with lib.maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91943c87fe69..5dace73d7b3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -185,6 +185,8 @@ in {
 
   bayespy = callPackage ../development/python-modules/bayespy { };
 
+  bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
+
   bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { };
 
   blivet = callPackage ../development/python-modules/blivet { };

From 36d01800571fadcc51d7561c9811a159bc282e3b Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Fri, 22 Dec 2017 15:08:31 -0600
Subject: [PATCH 58/78] altcoins.aeon: init at 0.9.14.0

---
 lib/maintainers.nix                         |  1 +
 pkgs/applications/altcoins/aeon/default.nix | 34 +++++++++++++++++++++
 pkgs/applications/altcoins/default.nix      |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/altcoins/aeon/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index eac6a7059ad8..d584645a72c9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -28,6 +28,7 @@
   afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ahmedtd = "Taahir Ahmed <ahmed.taahir@gmail.com>";
+  aij = "Ivan Jager <aij+git@mrph.org>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
   akc = "Anders Claesson <akc@akc.is>";
diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
new file mode 100644
index 000000000000..cfbb1f24b198
--- /dev/null
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
+
+let
+  version = "0.9.14.0";
+in
+stdenv.mkDerivation {
+  name = "aeon-${version}";
+
+  src = fetchFromGitHub {
+    owner = "aeonix";
+    repo = "aeon";
+    rev = "v${version}";
+    sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ boost miniupnpc openssl unbound ];
+
+  installPhase = ''
+    install -D src/aeond "$out/bin/aeond"
+    install src/simpleminer "$out/bin/aeon-simpleminer"
+    install src/simplewallet "$out/bin/aeon-simplewallet"
+    install src/connectivity_tool "$out/bin/aeon-connectivity-tool"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Private, secure, untraceable currency";
+    homepage = http://www.aeon.cash/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.aij ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 0e5ffab01f44..21c6b1341149 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -2,6 +2,8 @@
 
 rec {
 
+  aeon = callPackage ./aeon { };
+
   bitcoin  = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
 

From e0a356d1c79fa811ec493e3ac408c00c324d75d7 Mon Sep 17 00:00:00 2001
From: Bert Moens <bert.moens@gmail.com>
Date: Thu, 21 Dec 2017 09:58:21 +0100
Subject: [PATCH 59/78] =?UTF-8?q?espeak:=202016-08-28=20=E2=86=92=201.49.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/audio/espeak-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 889506deb768..f4160ff6f808 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "espeak-ng-${version}";
-  version = "2016-08-28";
+  version = "1.49.2";
 
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "espeak-ng";
-    rev = "b784e77c5708b61feed780d8f1113c4c8eb92200";
-    sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk";
+    rev = version;
+    sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c";
   };
 
   nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ];

From 857a71cbc51017ad660316f860a6fccf1a700c67 Mon Sep 17 00:00:00 2001
From: Bert Moens <bert.moens@gmail.com>
Date: Wed, 20 Dec 2017 23:52:42 +0100
Subject: [PATCH 60/78] speechd: 0.8.5 -> 0.8.8, refactored

---
 .../development/libraries/speechd/default.nix | 72 +++++++++++++++----
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index ee45c0d1c65a..b27fd0843bc0 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -1,29 +1,70 @@
-{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile
-, libao, python3Packages
-, withEspeak ? false, espeak
+{ stdenv, pkgconfig, fetchurl, python3Packages
+, intltool, itstool, libtool, texinfo, autoreconfHook
+, glib, dotconf, libsndfile
+, withLibao ? true, libao
+, withPulse ? false, libpulseaudio
+, withAlsa ? false, alsaLib
+, withOss ? false
+, withFlite ? true, flite
+# , withFestival ? false, festival-freebsoft-utils
+, withEspeak ? true, espeak, sonic, pcaudiolib
 , withPico ? true, svox
+# , withIvona ? false, libdumbtts
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (stdenv.lib) optional optionals;
+  inherit (python3Packages) python pyxdg wrapPython;
+
+  # speechd hard-codes espeak, even when built without support for it.
+  selectedDefaultModule =
+    if withEspeak then
+      "espeak-ng"
+    else if withPico then
+      "pico"
+    else if withFlite then
+      "flite"
+    else
+      throw "You need to enable at least one output module.";
+in stdenv.mkDerivation rec {
   name = "speech-dispatcher-${version}";
-  version = "0.8.5";
+  version = "0.8.8";
 
   src = fetchurl {
     url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
-    sha256 = "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb";
+    sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw";
   };
 
-  buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ]
-             ++ lib.optional withEspeak espeak
-             ++ lib.optional withPico svox;
-  nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook intltool libtool itstool texinfo wrapPython ];
 
-  hardeningDisable = [ "format" ];
+  buildInputs = [ glib dotconf libsndfile libao libpulseaudio alsaLib python ]
+    ++ optionals withEspeak [ espeak sonic pcaudiolib ]
+    ++ optional withFlite flite
+    ++ optional withPico svox
+    # TODO: add flint/festival support with festival-freebsoft-utils package
+    # ++ optional withFestival festival-freebsoft-utils
+    # TODO: add Ivona support with libdumbtts package
+    # ++ optional withIvona libdumbtts
+  ;
 
-  pythonPath = with python3Packages; [ pyxdg ];
+  pythonPath = [ pyxdg ];
 
-  postPatch = lib.optionalString withPico ''
-    sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c
+  configureFlags = [
+    # Audio method falls back from left to right.
+    "--with-default-audio-method=\"libao,pulse,alsa,oss\""
+  ] ++ optional withPulse "--with-pulse"
+    ++ optional withAlsa "--with-alsa"
+    ++ optional withLibao "--with-libao"
+    ++ optional withOss "--with-oss"
+    ++ optional withEspeak "--with-espeak-ng"
+    ++ optional withPico "--with-pico"
+    # ++ optional withFestival "--with-flint"
+    # ++ optional withIvona "--with-ivona"
+  ;
+
+  postPatch = ''
+    substituteInPlace config/speechd.conf --replace "DefaultModule espeak" "DefaultModule ${selectedDefaultModule}"
+    substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
   '';
 
   postInstall = ''
@@ -32,8 +73,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Common interface to speech synthesis";
-    homepage = http://www.freebsoft.org/speechd;
+    homepage = https://devel.freebsoft.org/speechd;
     license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ berce ];
     platforms = platforms.linux;
   };
 }

From d0bb0a2c538dbe84189da00848dd1f8d5e0deda3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Dec 2017 01:14:06 +0100
Subject: [PATCH 61/78] aiohttp-cors: 0.5.3 -> 0.6.0

---
 pkgs/applications/networking/gns3/server.nix     | 11 ++++++++++-
 pkgs/development/python-modules/aiohttp/cors.nix |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 59380cf6965e..b09e23218a15 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -36,7 +36,16 @@ let
       }));
   aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
     (oldAttrs:
-      { propagatedBuildInputs = [ aiohttp ]; }));
+      rec {
+        pname = "aiohttp-cors";
+        version = "0.5.3";
+        name = "${pname}-${version}";
+        src = pythonPackages.fetchPypi {
+          inherit pname version;
+          sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+        };
+        propagatedBuildInputs = [ aiohttp ];
+      }));
 in pythonPackages.buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "gns3-server";
diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix
index 78ed435504cf..ab9595ec2b9c 100644
--- a/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/pkgs/development/python-modules/aiohttp/cors.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-cors";
-  version = "0.5.3";
+  version = "0.6.0";
   name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+    sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
   };
 
   # Requires network access

From 0b0df8f9cfacd204a0155bcbb427873fc05adcf5 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 23 Dec 2017 01:08:05 +0100
Subject: [PATCH 62/78] nixos/logkeys: fix evaluation

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

diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index 6051c884465d..df0b3ae24c90 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 

From 027d7bbb71b28d30753d120832d9932e96fb3137 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 23 Dec 2017 02:19:01 +0100
Subject: [PATCH 63/78] uboot: add extraMakeFlags option

---
 pkgs/misc/uboot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 7580fd9d5bb9..18502577e3af 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -7,6 +7,7 @@ let
             , filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
            stdenv.mkDerivation (rec {
@@ -46,7 +47,7 @@ let
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ];
+    makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
 
     configurePhase = ''
       make ${defconfig}

From 8a844db5fc54693f2ada59d3c987d6354edc227c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 23 Dec 2017 02:19:13 +0100
Subject: [PATCH 64/78] ubootTools: set CONFIG_ARCH_MVEBU=y

u-boot only builds some architecture-specific tools, if this
architecture is selected in configuration. So a 'allnoconfig' won't
include them.

As they are pretty useful however, we'd like to have them in ubootTools.
This can be accomplished by enabling CONFIG_KIRKWOOD=y and possibly
more later.
---
 pkgs/misc/uboot/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 18502577e3af..f93b45a2a6b9 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -90,7 +90,15 @@ in rec {
     buildFlags = "tools NO_SDL=1";
     dontStrip = false;
     targetPlatforms = stdenv.lib.platforms.linux;
-    filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
+    # build tools/kwboot
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    filesToInstall = [
+      "tools/dumpimage"
+      "tools/fdtgrep"
+      "tools/kwboot"
+      "tools/mkenvimage"
+      "tools/mkimage"
+    ];
   };
 
   ubootA20OlinuxinoLime = buildUBoot rec {

From bae218e7b5d278ceeb8f7fd72a3dad9142b98daf Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 23 Dec 2017 00:28:59 +0100
Subject: [PATCH 65/78] ubootClearfog: add

---
 pkgs/misc/uboot/default.nix     | 7 +++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index f93b45a2a6b9..8fea1018d097 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -119,6 +119,13 @@ in rec {
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
+  # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
+  ubootClearfog = buildUBoot rec {
+    defconfig = "clearfog_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-spl.kwb"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e91b3e38a551..b4cd2fbe579a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13264,6 +13264,7 @@ with pkgs;
     ubootA20OlinuxinoLime
     ubootBananaPi
     ubootBeagleboneBlack
+    ubootClearfog
     ubootJetsonTK1
     ubootOdroidXU3
     ubootOrangePiPc

From c7f1aa38047bef88a6c32b9cbde1502bf7266530 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 23 Dec 2017 03:02:08 +0100
Subject: [PATCH 66/78] buildUboot: add openssl to nativeBuildInputs

required by tools/kwbimage.c, tools/mxsimage.c and in various other
places too.
As those are tools running on the host, it's a nativeBuildInput.
---
 pkgs/misc/uboot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 8fea1018d097..1bfcea1057e9 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, python2
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
 , hostPlatform
 }:
 
@@ -43,7 +43,7 @@ let
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 ];
 
     hardeningDisable = [ "all" ];
 

From c039fbb4bc3ec40e8bd7957c340b04e09d26aaa2 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Sat, 23 Dec 2017 01:14:09 -0500
Subject: [PATCH 67/78] paperwork: 1.2.1 -> 1.2.2

Paperwork has a new bugfix release.
---
 pkgs/applications/office/paperwork/backend.nix | 4 ++--
 pkgs/applications/office/paperwork/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 2e052243a052..9e17d807fb14 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "paperwork-backend";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "openpaperwork";
     repo = "paperwork-backend";
     rev = version;
-    sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x";
+    sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf";
   };
 
   # Python 2.x is not supported.
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index f0592aa0e687..953499c21b91 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -7,13 +7,13 @@
 python3Packages.buildPythonApplication rec {
   name = "paperwork-${version}";
   # Don't forget to also update paperwork-backend when updating this!
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     repo = "paperwork";
     owner = "openpaperwork";
     rev = version;
-    sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
+    sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk";
   };
 
   # Patch out a few paths that assume that we're using the FHS:

From fb51574bf61d557404ce5bf864427fb8445a8bda Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Dec 2017 09:44:11 +0100
Subject: [PATCH 68/78] python.pkgs.pandas: 0.21.0 -> 0.21.1

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 2cbb67545a06..e589e777f0df 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -28,12 +28,12 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.21.0";
+  version = "0.21.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nf50ls2cnlsd2635nyji7l70xc91dw81qg5y01g5sifwwqcpmaw";
+    sha256 = "c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a";
   };
 
   LC_ALL = "en_US.UTF-8";

From 5aa539a537a512789c5b748e4fc08e8f119e68da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Sat, 23 Dec 2017 09:28:53 +0100
Subject: [PATCH 69/78] kodi: fix hw accel

Also, drop SDL build inputs. SDL was not even detected/enabled.
---
 pkgs/applications/video/kodi/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index da90f681f7a8..125a6d492a32 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -8,8 +8,7 @@
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
 , libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
-, mesa, glew, fontconfig, freetype, ftgl
+, alsaLib, mesa, glew, fontconfig, freetype, ftgl
 , libjpeg, jasper, libpng, libtiff
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
@@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null;
 # - cmake is no longer in project/cmake
 # - maybe we can remove auto{conf,make} and libtool from inputs
 # - check if dbus support PR has been merged and add dbus as a buildInput
+# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
 
 let
   kodiReleaseDate = "20171115";
@@ -78,7 +78,8 @@ let
     preConfigure = ''
       cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
     '';
-    buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ];
+    buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ]
+      ++ lib.optional  vdpauSupport    libvdpau;
     nativeBuildInputs = [ cmake nasm pkgconfig ];
   };
 
@@ -124,9 +125,8 @@ in stdenv.mkDerivation rec {
       openssl gperf tinyxml2 taglib libssh swig jre
       libX11 xproto inputproto libXt libXmu libXext xextproto
       libXinerama libXrandr randrproto libXtst libXfixes fixesproto
-      SDL SDL_image SDL_mixer alsaLib
-      mesa glew fontconfig freetype ftgl
-      libjpeg jasper libpng libtiff libva wayland
+      alsaLib mesa glew fontconfig freetype ftgl
+      libjpeg jasper libpng libtiff wayland
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
@@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
       # libdvdcss libdvdnav libdvdread
     ]
     ++ lib.optional  dbusSupport     dbus_libs
-    ++ lib.optionals joystickSupport [ cwiid SDL2 ]
+    ++ lib.optionals joystickSupport [ cwiid ]
     ++ lib.optional  nfsSupport      libnfs
     ++ lib.optional  pulseSupport    libpulseaudio
     ++ lib.optional  rtmpSupport     rtmpdump
@@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
         wrapProgram $out/bin/$p \
           --prefix PATH            ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
-              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
+              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
       done
 
       substituteInPlace $out/share/xsessions/kodi.desktop \

From b37a6a2b9a03e4add2f7b7a58359e9e432501266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 19 Dec 2017 09:30:20 -0200
Subject: [PATCH 70/78] gparted: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 76bfb8c661ed..be002a8c3ad9 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.29.0";
+  name = "gparted-0.30.0";
 
   src = fetchurl {
-    sha256 = "1kf3ly7m3bikyzapjw8q1rlia0kg5zzgp59akhabx1rnnimvyl12";
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
+    sha256 = "0jngbsbvg8k8vbpsphqbk8br2cbmxhabbm2c5bmxm2q5zvpr64fk";
   };
 
   configureFlags = [ "--disable-doc" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
 
   postInstall = ''
-    wrapProgram $out/sbin/gparted \
+    wrapProgram $out/bin/gparted \
       --prefix PATH : "${procps}/bin"
     wrapProgram $out/sbin/gpartedbin \
       --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}"

From a02f66e87b99822e65fb64878a0b42f49d5738ee Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Dec 2017 11:40:43 +0100
Subject: [PATCH 71/78] gns3Packages.{server,gui}{Stable,Preview}: 2.1.0 ->
 2.1.1

---
 pkgs/applications/networking/gns3/default.nix | 12 ++++++------
 pkgs/applications/networking/gns3/server.nix  | 11 ++---------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 72ffbb6e6d3a..1d120f09a91d 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,8 +1,8 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.0";
-  previewVersion = "2.1.0rc4"; # == 2.1.0
+  stableVersion = "2.1.1";
+  previewVersion = "2.1.1";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
@@ -12,19 +12,19 @@ let
 in {
   guiStable = mkGui {
     stable = true;
-    sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk";
+    sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk";
   };
   guiPreview = mkGui {
     stable = false;
-    sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
+    sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk";
   };
 
   serverStable = mkServer {
     stable = true;
-    sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39";
+    sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv";
   };
   serverPreview = mkServer {
     stable = false;
-    sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
+    sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv";
   };
 }
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index b09e23218a15..5a201dfc4074 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -24,13 +24,6 @@ let
   aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
     (oldAttrs:
       rec {
-        pname = "aiohttp";
-        version = "2.2.5";
-        name = "${pname}-${version}";
-        src = pythonPackages.fetchPypi {
-          inherit pname version;
-          sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
-        };
         propagatedBuildInputs = [ yarl multidict_3_1_3 ]
           ++ (with pythonPackages; [ async-timeout chardet ]);
       }));
@@ -57,7 +50,7 @@ in pythonPackages.buildPythonPackage rec {
     sha256 = sha256Hash;
   };
 
-  propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ]
+  propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ]
     ++ (with pythonPackages; [
       jinja2 psutil zipstream raven jsonschema typing
       prompt_toolkit
@@ -71,7 +64,7 @@ in pythonPackages.buildPythonPackage rec {
   doCheck = false;
 
   postInstall = ''
-    rm $out/bin/gns3loopback # For windows only
+    rm $out/bin/gns3loopback # For Windows only
   '';
   meta = with stdenv.lib; {
     description = "Graphical Network Simulator 3 server (${branch} release)";

From dd2242efccdce7293992e72ebae4ee48f2e25686 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Thu, 21 Dec 2017 20:56:54 +0100
Subject: [PATCH 72/78] nextcloud: 12.0.3 -> 12.0.4

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index ec4e78a54ece..d2e08932fe1d 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "12.0.3";
+  version = "12.0.4";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0wgvvpk7h7psy41a32f0ljh6iasjsqbf4pxi8nhybl46m35srg48";
+    sha256 = "1dh9knqbw6ph2rfrb5rscdraj4375rqddmrifw6adyga9jkn2hb5";
   };
 
   installPhase = ''

From b5a61f2c599ac665e3c3129258ea8671cb5760af Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 23 Dec 2017 07:19:45 -0500
Subject: [PATCH 73/78] Revert "nixos: doc: implement related packages in the
 manual"

---
 lib/default.nix                               |  6 ++--
 lib/lists.nix                                 | 24 -------------
 lib/options.nix                               |  9 +++--
 lib/trivial.nix                               | 25 --------------
 nixos/doc/manual/default.nix                  | 34 ++-----------------
 nixos/doc/manual/options-to-docbook.xsl       |  9 -----
 nixos/modules/programs/tmux.nix               |  7 +---
 nixos/modules/rename.nix                      |  4 ---
 nixos/modules/virtualisation/xen-dom0.nix     | 25 ++++++++------
 .../virtualization/qemu/default.nix           |  4 ---
 pkgs/applications/virtualization/xen/4.5.nix  |  6 ----
 pkgs/applications/virtualization/xen/4.8.nix  |  6 ----
 12 files changed, 26 insertions(+), 133 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index eb19dc06ce80..9dc4fea99fc2 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,7 +56,7 @@ let
       replaceStrings seq stringLength sub substring tail;
     inherit (trivial) id const concat or and boolToString mergeAttrs
       flip mapNullable inNixShell min max importJSON warn info
-      nixpkgsVersion mod compare splitByAndCompare;
+      nixpkgsVersion mod;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
@@ -71,8 +71,8 @@ let
     inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
-      reverseList listDfs toposort sort compareLists take drop sublist
-      last init crossLists unique intersectLists subtractLists
+      reverseList listDfs toposort sort take drop sublist last init
+      crossLists unique intersectLists subtractLists
       mutuallyExclusive;
     inherit (strings) concatStrings concatMapStrings concatImapStrings
       intersperse concatStringsSep concatMapStringsSep
diff --git a/lib/lists.nix b/lib/lists.nix
index f7e09040a5aa..8f67c6bb0ca3 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -385,30 +385,6 @@ rec {
       if len < 2 then list
       else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right));
 
-  /* Compare two lists element-by-element.
-
-     Example:
-       compareLists compare [] []
-       => 0
-       compareLists compare [] [ "a" ]
-       => -1
-       compareLists compare [ "a" ] []
-       => 1
-       compareLists compare [ "a" "b" ] [ "a" "c" ]
-       => 1
-  */
-  compareLists = cmp: a: b:
-    if a == []
-    then if b == []
-         then 0
-         else -1
-    else if b == []
-         then 1
-         else let rel = cmp (head a) (head b); in
-              if rel == 0
-              then compareLists cmp (tail a) (tail b)
-              else rel;
-
   /* Return the first (at most) N elements of a list.
 
      Example:
diff --git a/lib/options.nix b/lib/options.nix
index ab1201c718a0..769d3cc55723 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -14,7 +14,6 @@ rec {
     , defaultText ? null # Textual representation of the default, for in the manual.
     , example ? null # Example value used in the manual.
     , description ? null # String describing the option.
-    , relatedPackages ? null # Related packages used in the manual.
     , type ? null # Option type, providing type-checking and value merging.
     , apply ? null # Function that converts the option value to something else.
     , internal ? null # Whether the option is for NixOS developers only.
@@ -77,6 +76,7 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
+
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
@@ -93,10 +93,9 @@ rec {
           readOnly = opt.readOnly or false;
           type = opt.type.description or null;
         }
-        // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
-        // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
-        // optionalAttrs (opt ? defaultText) { default = opt.defaultText; }
-        // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; };
+        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
+        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
+        // (if opt ? defaultText then { default = opt.defaultText; } else {});
 
         subOptions =
           let ss = opt.type.getSubOptions opt.loc;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 5f18c0b61cc0..c452c7b65bc1 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -81,31 +81,6 @@ rec {
   */
   mod = base: int: base - (int * (builtins.div base int));
 
-  /* C-style comparisons
-
-     a < b  => -1
-     a == b => 0
-     a > b  => 1
-  */
-  compare = a: b:
-    if a < b
-    then -1
-    else if a > b
-         then 1
-         else 0;
-
-  /* Split type into two subtypes by predicate `p`, assume
-
-       forall x y . x < y if p x == true && p y == false
-
-     compare elements of the same subtype with `yes` and `no`
-     comparisons respectively.
-  */
-  splitByAndCompare = p: yes: no: a: b:
-    if p a
-    then if p b then yes a b else -1
-    else if p b then 1 else no a b;
-
   /* Reads a JSON file. */
   importJSON = path:
     builtins.fromJSON (builtins.readFile path);
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 95363c2458f5..9bc83be66104 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -15,27 +15,13 @@ let
     else if builtins.isFunction x then "<function>"
     else x;
 
-  # Generate DocBook documentation for a list of packages
-  genRelatedPackages = packages:
-    let
-      unpack = p: if lib.isString p then { name = p; } else p;
-      describe = { name, package ? pkgs.${name}, comment ? "" }:
-          "<listitem>"
-        + "<para><option>pkgs.${name}</option> (${package.name}): ${package.meta.description or "???"}.</para>"
-        + lib.optionalString (comment != "") "\n<para>${comment}</para>"
-        # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting>
-        + lib.optionalString (package.meta ? longDescription) "\n<programlisting>${package.meta.longDescription}</programlisting>"
-        + "</listitem>";
-    in "<itemizedlist>${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}</itemizedlist>";
-
+  # Clean up declaration sites to not refer to the NixOS source tree.
   optionsList' = lib.flip map optionsList (opt: opt // {
-    # Clean up declaration sites to not refer to the NixOS source tree.
     declarations = map stripAnyPrefixes opt.declarations;
   }
   // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; }
-  // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }
-  // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; });
+  // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; });
 
   # We need to strip references to /nix/store/* from options,
   # including any `extraSources` if some modules came from elsewhere,
@@ -46,22 +32,8 @@ let
   prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
   stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
 
-  # Custom "less" that pushes up all the things ending in ".enable*"
-  # and ".package"
-  optionListLess = a: b:
-    let
-      splt = lib.splitString ".";
-      ise = lib.hasPrefix "enable";
-      isp = lib.hasPrefix "package";
-      cmp = lib.splitByAndCompare ise lib.compare
-                                 (lib.splitByAndCompare isp lib.compare lib.compare);
-    in lib.compareLists cmp (splt a) (splt b) < 0;
-
-  # Customly sort option list for the man page.
-  optionsList'' = lib.sort (a: b: optionListLess a.name b.name) optionsList';
-
   # Convert the list of options into an XML file.
-  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'');
+  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');
 
   optionsDocBook = runCommand "options-db.xml" {} ''
     optionsXML=${optionsXML}
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 7b45b233ab2a..5387546b5982 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -70,15 +70,6 @@
                 </para>
               </xsl:if>
 
-              <xsl:if test="attr[@name = 'relatedPackages']">
-                <para>
-                  <emphasis>Related packages:</emphasis>
-                  <xsl:text> </xsl:text>
-                  <xsl:value-of disable-output-escaping="yes"
-                                select="attr[@name = 'relatedPackages']/string/@value" />
-                </para>
-              </xsl:if>
-
               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
                 <para>
                   <emphasis>Declared by:</emphasis>
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index 967001845f02..ed1d88a420a2 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -61,12 +61,7 @@ in {
   options = {
     programs.tmux = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whenever to configure <command>tmux</command> system-wide.";
-        relatedPackages = [ "tmux" ];
-      };
+      enable = mkEnableOption "<command>tmux</command> - a <command>screen</command> replacement.";
 
       aggressiveResize = mkOption {
         default = false;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 00d55fc28cbb..5e207a9509e2 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -207,7 +207,6 @@ with lib;
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
-    (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
@@ -218,8 +217,5 @@ with lib;
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
-
-    # Xen
-    (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
   ];
 }
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index afc5a42f8b4e..c7656bc309c0 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -35,19 +35,24 @@ in
       description = ''
         The package used for Xen binary.
       '';
-      relatedPackages = [ "xen" "xen-light" ];
     };
 
-    virtualisation.xen.package-qemu = mkOption {
+    virtualisation.xen.qemu = mkOption {
+      type = types.path;
+      defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+      example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
+      description = ''
+        The qemu binary to use for Dom-0 backend.
+      '';
+    };
+
+    virtualisation.xen.qemu-package = mkOption {
       type = types.package;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.qemu_xen-light";
       description = ''
-        The package with qemu binaries for dom0 qemu and xendomains.
+        The package with qemu binaries for xendomains.
       '';
-      relatedPackages = [ "xen"
-                          { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; }
-                        ];
     };
 
     virtualisation.xen.bootParams =
@@ -153,7 +158,8 @@ in
     } ];
 
     virtualisation.xen.package = mkDefault pkgs.xen;
-    virtualisation.xen.package-qemu = mkDefault pkgs.xen;
+    virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+    virtualisation.xen.qemu-package = mkDefault pkgs.xen;
     virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
 
     environment.systemPackages = [ cfg.package ];
@@ -333,8 +339,7 @@ in
       after = [ "xen-console.service" ];
       requires = [ "xen-store.service" ];
       serviceConfig.ExecStart = ''
-        ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \
-           -xen-attach -xen-domid 0 -name dom0 -M xenpv \
+        ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
            -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
         '';
     };
@@ -443,7 +448,7 @@ in
       before = [ "dhcpd.service" ];
       restartIfChanged = false;
       serviceConfig.RemainAfterExit = "yes";
-      path = [ cfg.package cfg.package-qemu ];
+      path = [ cfg.package cfg.qemu-package ];
       environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains";
       preStart = "mkdir -p /var/lock/subsys -m 755";
       serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start";
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 68ab979ecfbe..91b02f7ad1f0 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -101,10 +101,6 @@ stdenv.mkDerivation rec {
     else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else "";
 
-  passthru = {
-    qemu-system-i386 = "bin/qemu-system-i386";
-  };
-
   meta = with stdenv.lib; {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 22799a7af8e7..ec3fe9ccf221 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -248,10 +248,4 @@ callPackage (import ./generic.nix (rec {
       -i tools/libxl/libxl_device.c
   '';
 
-  passthru = {
-    qemu-system-i386 = if withInternalQemu
-      then "lib/xen/bin/qemu-system-i386"
-      else throw "this xen has no qemu builtin";
-  };
-
 })) ({ ocamlPackages = ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 44a52a1026af..6eedca18960b 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -176,10 +176,4 @@ callPackage (import ./generic.nix (rec {
       -i tools/libxl/libxl_device.c
   '';
 
-  passthru = {
-    qemu-system-i386 = if withInternalQemu
-      then "lib/xen/bin/qemu-system-i386"
-      else throw "this xen has no qemu builtin";
-  };
-
 })) args

From bcfe03cc120ce431efd0c041b5df0205e15d99ba Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Dec 2017 14:02:59 +0100
Subject: [PATCH 74/78] wlroots: 2017-10-31 -> 2017-12-22 + Init rootston

---
 .../development/libraries/wlroots/default.nix | 24 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 79bd8bb96659..8db3c466522c 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,30 +1,42 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig
 , wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap
+, xcbutilwm, libX11, libcap, xcbutilimage
 }:
 
 let pname = "wlroots";
-    version = "unstable-2017-10-31";
+    version = "unstable-2017-12-22";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
-    rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";
-    sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";
+    rev = "0a370c529806077a11638e7fa856d5fbb539496b";
+    sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";
   };
 
   # TODO: Temporary workaround for compilation errors
-  patches = [ ./libdrm.patch ./no-werror.patch ];
+  patches = [ ./libdrm.patch ]; #./no-werror.patch
+
+  # $out for the library and $bin for rootston
+  outputs = [ "out" "bin" ];
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
     wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap
+    xcbutilwm libX11 libcap xcbutilimage
   ];
 
+  # Install rootston (the reference compositor) to $bin
+  postInstall = ''
+    mkdir -p $bin/bin
+    cp rootston/rootston $bin/bin/
+    mkdir $bin/lib
+    cp libwlroots.so $bin/lib/
+    patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
+  '';
+
   meta = with stdenv.lib; {
     description = "A modular Wayland compositor library";
     inherit (src.meta) homepage;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4cd2fbe579a..1b01af60acdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15353,6 +15353,7 @@ with pkgs;
 
   wlc = callPackage ../development/libraries/wlc { };
   wlroots = callPackage ../development/libraries/wlroots { };
+  rootston = wlroots.bin;
   orbment = callPackage ../applications/window-managers/orbment { };
   sway = callPackage ../applications/window-managers/sway { };
 

From 35b2e4cceaa2db508d53105b8dc3172da59c451b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Dec 2017 13:50:43 +0100
Subject: [PATCH 75/78] eclipse-plugin-checkstyle: 8.0.0 -> 8.5.1

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 594739f568e0..611b995c08dd 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -192,12 +192,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "8.0.0.201707161819";
+    version = "8.5.1.201712211522";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip";
-      sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip";
+      sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab";
     };
 
     meta = with stdenv.lib; {

From 4b30470196b2570cfcc67d077755be143b1b80b8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Dec 2017 15:24:01 +0100
Subject: [PATCH 76/78] perl-Log-Any: 1.703 -> 1.704

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 291cae6f6bde..802d777b5b2f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8047,10 +8047,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.703";
+    name = "Log-Any-1.704";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz";
-      sha256 = "65a2ffba5f5fd355ce0b2365b478dda5ee091cf9d81c047dd22fe5ef4f823e3b";
+      sha256 = "57289d17b83bb5ce1d44148fd4e31a82b0d27e9104706ddc1ec5bb15461d0dd9";
     };
     # Syslog test fails.
     preCheck = "rm t/syslog.t";

From ca7472b1a7843d96a45c9fae783bf97cdb81d547 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sat, 23 Dec 2017 01:33:28 +0000
Subject: [PATCH 77/78] mbpfan: improve description, resolves #32266

---
 nixos/modules/services/misc/mbpfan.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 972d8b572d36..50f6f80ad00c 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -8,13 +8,7 @@ let
 
 in {
   options.services.mbpfan = {
-    enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Whether to enable the mbpfan daemon.
-      '';
-    };
+    enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks";
 
     package = mkOption {
       type = types.package;

From 21c61d514d4de2a3512500f0d62746ca43b9d1f0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 23 Dec 2017 10:02:14 -0500
Subject: [PATCH 78/78] openjdk: 9.0.0 -> 9.0.1

---
 pkgs/development/compilers/openjdk/9.nix | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix
index 8697712de988..f76d1e8ffb5c 100644
--- a/pkgs/development/compilers/openjdk/9.nix
+++ b/pkgs/development/compilers/openjdk/9.nix
@@ -21,45 +21,45 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "";
-  build = "181";
-  baseurl = "http://hg.openjdk.java.net/jdk9/jdk9";
-  repover = "jdk-9${update}+${build}";
+  update = "9.0.1";
+  build = "11";
+  baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u";
+  repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk9 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "0c7jwz4qvl93brs6c2v4dfc2v3lsv6ic0y72lkh04bnxg9343z82";
+             sha256 = "13zqai3kpk5yi7yg3f7n2ss8spzyq0zy9431y97ni0j72h8ddsvy";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1wa5rjan6lcs8nnxndbwpw6gkx3qbw013s6zisjjczkcaiq044pp";
+             sha256 = "1w2djchv3dr8hv815kxfi1458n1nbq23yzv4p8rxpl1fzxrcd5pm";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "00jnj19rim1gxpsxrpr8ifx1glwrbma3qjiy1ya7n5f08fb263hs";
+             sha256 = "1kb4h9w0xbxvndi5rk3byv3v95883nkqdzjadbw1cvqvzp3kgaw8";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "1gvx6dblzj7rb8648iqwdiv36x97ibykgs323dd9044n3vbqihvj";
+             sha256 = "0hqzmlg6dmr67ghrlh515iam34d9jx4jcdbhchbl2ny00q42diy2";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "15pwdw6s03rfyw2gx06xg4f70bjl8j19ycssxiigj39h524xc9aw";
+             sha256 = "0km0k9hi8wfv2d10i08jgb4kf0l8jhp1174dsmmc9yh0ig1vij08";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "0jz32pjbgr77ybb2v1vwr1n9ljdrc3y0d5lrj072g3is1hmn2wbh";
+             sha256 = "1crsr3hcq4j0xbmn1jcsw0m6hxqqkxxsib86i63vvcha94336iyp";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "1jdxr9hcqx6va56ll5s2x9bx9dnlrs7zyvhjk1zgr5hxg5yfcqzr";
+             sha256 = "1w9i1zl72nq7aw9l50fc7dlggiy7iq52p8xh44hv50mdvn0xsa4k";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "12lihmw9ga6yhz0h26fvfablcjkkma0k3idjggmap97xha8zgd6n";
+             sha256 = "0rm50mk6935iqx2rla6j8j8kjs0p4f7rff0wsp0qvbf6g0pwwks1";
           };
   openjdk9 = stdenv.mkDerivation {
-    name = "openjdk-9${update}-b${build}";
+    name = "openjdk-${update}-b${build}";
 
     srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ];
     sourceRoot = ".";